X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/510132b69d4fdceca750f6de39b2be84c49006c8..ebce5315554ed351fb77dfa286a373591d3495f3:/openssh/auth-sia.c

diff --git a/openssh/auth-sia.c b/openssh/auth-sia.c
index 58b17c1..4e947cd 100644
--- a/openssh/auth-sia.c
+++ b/openssh/auth-sia.c
@@ -1,32 +1,7 @@
-/*
- * Copyright (c) 2002 Chris Adams.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 #include "includes.h"
 
 #ifdef HAVE_OSF_SIA
 #include "ssh.h"
-#include "auth.h"
 #include "auth-sia.h"
 #include "log.h"
 #include "servconf.h"
@@ -48,16 +23,15 @@ extern char **saved_argv;
 extern int errno;
 
 int
-auth_sia_password(Authctxt *authctxt, char *pass)
+auth_sia_password(char *user, char *pass)
 {
 	int ret;
 	SIAENTITY *ent = NULL;
 	const char *host;
-	char *user = authctxt->user;
 
-	host = get_canonical_hostname(options.verify_reverse_mapping);
+	host = get_canonical_hostname(options.reverse_mapping_check);
 
-	if (!user || !pass || pass[0] == '\0')
+	if (!user || !pass)
 		return(0);
 
 	if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, NULL, 0,
@@ -65,7 +39,7 @@ auth_sia_password(Authctxt *authctxt, char *pass)
 		return(0);
 
 	if ((ret = sia_ses_authent(NULL, pass, ent)) != SIASUCCESS) {
-		error("Couldn't authenticate %s from %s", user, host);
+		error("couldn't authenticate %s from %s", user, host);
 		if (ret & SIASTOP)
 			sia_ses_release(&ent);
 		return(0);
@@ -79,46 +53,55 @@ auth_sia_password(Authctxt *authctxt, char *pass)
 void
 session_setup_sia(char *user, char *tty)
 {
+	int ret;
 	struct passwd *pw;
 	SIAENTITY *ent = NULL;
 	const char *host;
 
-	host = get_canonical_hostname (options.verify_reverse_mapping);
+	host = get_canonical_hostname (options.reverse_mapping_check);
 
 	if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0,
 	    NULL) != SIASUCCESS) {
-		fatal("sia_ses_init failed");
+		error("sia_ses_init failed");
+		exit(1);
 	}
 
 	if ((pw = getpwnam(user)) == NULL) {
 		sia_ses_release(&ent);
-		fatal("getpwnam: no user: %s", user);
+		error("getpwnam(%s) failed: %s", user, strerror(errno));
+		exit(1);
 	}
 	if (sia_make_entity_pwd(pw, ent) != SIASUCCESS) {
 		sia_ses_release(&ent);
-		fatal("sia_make_entity_pwd failed");
+		error("sia_make_entity_pwd failed");
+		exit(1);
 	}
 
 	ent->authtype = SIA_A_NONE;
 	if (sia_ses_estab(sia_collect_trm, ent) != SIASUCCESS) {
-		fatal("Couldn't establish session for %s from %s", user,
+		error("couldn't establish session for %s from %s", user,
 		    host);
+		exit(1);
 	}
 
 	if (setpriority(PRIO_PROCESS, 0, 0) == -1) {
 		sia_ses_release(&ent);
-		fatal("setpriority: %s", strerror (errno));
+		error("setpriority failed: %s", strerror (errno));
+		exit(1);
 	}
 
 	if (sia_ses_launch(sia_collect_trm, ent) != SIASUCCESS) {
-		fatal("Couldn't launch session for %s from %s", user, host);
+		error("couldn't launch session for %s from %s", user, host);
+		exit(1);
 	}
 	
 	sia_ses_release(&ent);
 
 	if (setreuid(geteuid(), geteuid()) < 0) {
-		fatal("setreuid: %s", strerror(errno));
+		error("setreuid failed: %s", strerror (errno));
+		exit(1);
 	}
 }
 
 #endif /* HAVE_OSF_SIA */
+