Tru64 updates from trunk.

diff --git a/etc/uams/uams_dhx_passwd.c b/etc/uams/uams_dhx_passwd.c
index 9c41456beee4703e98f409fed10640161f4cc39a..0484f2408696ad1bbb9e0e08e94882951ec6cc93 100644 (file)
--- a/etc/uams/uams_dhx_passwd.c
+++ b/etc/uams/uams_dhx_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_dhx_passwd.c,v 1.13 2001-10-24 16:25:24 srittau Exp $
+ * $Id: uams_dhx_passwd.c,v 1.13.2.1 2002-03-12 16:08:49 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -270,8 +270,8 @@ static int passwd_logincont(void *obj, struct passwd **uam_pwd,
         uam_afp_getcmdline( &ac, &av );
         sprintf( hostname, "%s@%s", dhxpwd->pw_name, clientname );
 
-        if( sia_validate_user( NULL, ac, av, hostname, dhxpwd->pw_name,
-                               NULL, FALSE, NULL, rbuf ) != SIASUCCESS )
+        if( uam_sia_validate_user( NULL, ac, av, hostname, dhxpwd->pw_name,
+                                   NULL, FALSE, NULL, rbuf ) != SIASUCCESS )
             return AFPERR_NOTAUTH;
 
         memset( rbuf, 0, PASSWDLEN );

diff --git a/etc/uams/uams_passwd.c b/etc/uams/uams_passwd.c
index 97d93a256df76cd2505a21eb70ca951b239d7f43..a83e6140a9663bf7332afd50bee229f1db6641a3 100644 (file)
--- a/etc/uams/uams_passwd.c
+++ b/etc/uams/uams_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_passwd.c,v 1.13.2.1 2002-02-08 00:00:01 srittau Exp $
+ * $Id: uams_passwd.c,v 1.13.2.2 2002-03-12 16:08:49 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -137,8 +137,8 @@ static int passwd_login(void *obj, struct passwd **uam_pwd,
         uam_afp_getcmdline( &ac, &av );
         sprintf( hostname, "%s@%s", username, clientname );
 
-        if( sia_validate_user( NULL, ac, av, hostname, username,
-                               NULL, FALSE, NULL, ibuf ) != SIASUCCESS )
+        if( uam_sia_validate_user( NULL, ac, av, hostname, username,
+                                   NULL, FALSE, NULL, ibuf ) != SIASUCCESS )
             return AFPERR_NOTAUTH;
 
         return AFP_OK;
@@ -201,8 +201,8 @@ static int passwd_changepw(void *obj, char *username,
 
 /* Printer ClearTxtUAM login */
 static int passwd_printer(start, stop, username, out)
-       char    *start, *stop, *username;
-       struct papfile  *out;
+char   *start, *stop, *username;
+struct papfile *out;
 {
     struct passwd *pwd;
 #ifdef SHADOWPW

diff --git a/include/atalk/uam.h b/include/atalk/uam.h
index 060bc228588f03b734a94e73fdae4a090b05e637..44847712ac53410ff1a309dcfbe07459e0940878 100644 (file)
--- a/include/atalk/uam.h
+++ b/include/atalk/uam.h
@@ -9,6 +9,11 @@
 #include <pwd.h>
 #include <stdarg.h>
 
+#ifdef TRU64
+#include <sia.h>
+#include <siad.h>
+#endif /* TRU64 */
+
 /* just a label for exported bits */
 #define UAM_MODULE_EXPORT
 
@@ -64,6 +69,9 @@ extern int uam_afp_read __P((void *, char *, int *,
 extern int uam_afpserver_option __P((void *, const int, void *, int *));
 #ifdef TRU64
 extern void uam_afp_getcmdline __P((int *, char ***));
+extern int uam_sia_validate_user __P((sia_collect_func_t *, int, char **,
+                                     char *, char *, char *, int, char *,
+                                     char *));
 #endif /* TRU64 */
 
 /* switch.c */