]> arthur.barton.de Git - netatalk.git/commitdiff
Register just UAM_SERVER_LOGIN_EXT
authorJamie Gilbertson <jamie.gilbertson@luniv.ca>
Tue, 13 Mar 2012 02:34:29 +0000 (20:34 -0600)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 19 Mar 2012 11:48:24 +0000 (12:48 +0100)
Registering UAM_SERVER_LOGIN_EXT is sufficent, since it and UAM_SERVER_LOGIN are treated the same by uam.c and auth.c

Signed-off-by: Jamie Gilbertson <jamie.gilbertson@luniv.ca>
etc/uams/uams_gss.c

index 0298f3368a0748e28a7db118de75bafba5489b59..3275f243feedbbb6d83008ed0544676ab68ca5c2 100644 (file)
@@ -419,15 +419,10 @@ static int gss_login_ext(void *obj, char *uname, struct passwd **uam_pwd,
     return gss_login(obj, uam_pwd, ibuf, ibuflen, rbuf, rbuflen);
 }
 
-int uam_setup(const char *path)
+static int uam_setup(const char *path)
 {
-    if (uam_register(UAM_SERVER_LOGIN_EXT, path, "Client Krb v2",
-                     gss_login, gss_logincont, gss_logout, gss_login_ext) < 0)
-        if (uam_register(UAM_SERVER_LOGIN, path, "Client Krb v2",
-                         gss_login, gss_logincont, gss_logout) < 0)
-            return -1;
-
-    return 0;
+    return uam_register(UAM_SERVER_LOGIN_EXT, path, "Client Krb v2",
+                        gss_login, gss_logincont, gss_logout, gss_login_ext);
 }
 
 static void uam_cleanup(void)