Merge tag 'debian/1.8.5p2-1' into squeeze

[debian/sudo] / auth / sia.c

diff --git a/auth/sia.c b/auth/sia.c
deleted file mode 100644 (file)
index 188676a..0000000
--- a/auth/sia.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1999-2005, 2007, 2010
- *     Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif /* STDC_HEADERS */
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif /* HAVE_STRINGS_H */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <pwd.h>
-#include <siad.h>
-
-#include "sudo.h"
-#include "sudo_auth.h"
-
-static int sudo_collect        __P((int, int, uchar_t *, int, prompt_t *));
-
-static char *def_prompt;
-
-/*
- * Collection routine (callback) for limiting the timeouts in SIA
- * prompts and (possibly) setting a custom prompt.
- */
-static int
-sudo_collect(timeout, rendition, title, nprompts, prompts)
-    int timeout;
-    int rendition;
-    uchar_t *title;
-    int nprompts;
-    prompt_t *prompts;
-{
-    switch (rendition) {
-       case SIAFORM:
-       case SIAONELINER:
-           if (timeout <= 0 || timeout > def_passwd_timeout * 60)
-               timeout = def_passwd_timeout * 60;
-           /*
-            * Substitute custom prompt if a) the sudo prompt is not "Password:"
-            * and b) the SIA prompt is "Password:" (so we know it is safe).
-            * This keeps us from overwriting things like S/Key challenges.
-            */
-           if (strcmp((char *)prompts[0].prompt, "Password:") == 0 &&
-               strcmp(def_prompt, "Password:") != 0)
-               prompts[0].prompt = (unsigned char *)def_prompt;
-           break;
-       default:
-           break;
-    }
-
-    return sia_collect_trm(timeout, rendition, title, nprompts, prompts);
-}
-
-int
-sia_setup(pw, promptp, auth)
-    struct passwd *pw;
-    char **promptp;
-    sudo_auth *auth;
-{
-    SIAENTITY *siah = NULL;
-    extern int Argc;
-    extern char **Argv;
-
-    if (sia_ses_init(&siah, Argc, Argv, NULL, pw->pw_name, ttyname(0), 1, NULL)
-       != SIASUCCESS) {
-
-       log_error(USE_ERRNO|NO_EXIT|NO_MAIL,
-           "unable to initialize SIA session");
-       return(AUTH_FATAL);
-    }
-
-    auth->data = (void *) siah;
-    return(AUTH_SUCCESS);
-}
-
-int
-sia_verify(pw, prompt, auth)
-    struct passwd *pw;
-    char *prompt;
-    sudo_auth *auth;
-{
-    SIAENTITY *siah = (SIAENTITY *) auth->data;
-
-    def_prompt = prompt;               /* for sudo_collect */
-
-    /* XXX - need a way to detect user hitting return or EOF at prompt */
-    if (sia_ses_reauthent(sudo_collect, siah) == SIASUCCESS)
-       return(AUTH_SUCCESS);
-    else
-       return(AUTH_FAILURE);
-}
-
-int
-sia_cleanup(pw, auth)
-    struct passwd *pw;
-    sudo_auth *auth;
-{
-    SIAENTITY *siah = (SIAENTITY *) auth->data;
-
-    (void) sia_ses_release(&siah);
-    return(AUTH_SUCCESS);
-}