- (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal

[openssh.git] / auth-sia.c

diff --git a/auth-sia.c b/auth-sia.c
index 05cf47c40f514db43532679cdffb4103d2b97053..63f55d07f2d18943ed795d261209a1547617c552 100644 (file)
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "servconf.h"
 #include "canohost.h"
+#include "uidswap.h"
 
 #include <sia.h>
 #include <siad.h>
@@ -46,13 +47,13 @@ extern int saved_argc;
 extern char **saved_argv;
 
 int
-auth_sia_password(Authctxt *authctxt, char *pass)
+sys_auth_passwd(Authctxt *authctxt, char *pass)
 {
        int ret;
        SIAENTITY *ent = NULL;
        const char *host;
 
-       host = get_canonical_hostname(options.verify_reverse_mapping);
+       host = get_canonical_hostname(options.use_dns);
 
        if (!authctxt->user || pass == NULL || pass[0] == '\0')
                return (0);
@@ -81,9 +82,9 @@ session_setup_sia(struct passwd *pw, char *tty)
        SIAENTITY *ent = NULL;
        const char *host;
 
-       host = get_canonical_hostname(options.verify_reverse_mapping);
+       host = get_canonical_hostname(options.use_dns);
 
-       if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name, 
+       if (sia_ses_init(&ent, saved_argc, saved_argv, host, pw->pw_name,
            tty, 0, NULL) != SIASUCCESS)
                fatal("sia_ses_init failed");
 
@@ -100,11 +101,11 @@ session_setup_sia(struct passwd *pw, char *tty)
        if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS)
                fatal("Couldn't launch session for %s from %s",
                    pw->pw_name, host);
-       
+
        sia_ses_release(&ent);
 
-       if (setreuid(geteuid(), geteuid()) < 0)
-               fatal("setreuid: %s", strerror(errno));
+       setuid(0);
+       permanently_set_uid(pw);
 }
 
 #endif /* HAVE_OSF_SIA */