pam_smbpass in CVS and 2.2.3a

[Lauri Jesmin]

pam_smbpass included in samba 2.2.3a release and in cvs SAMBA_2_2 branch
did not work and needed little updating.
Included patch is against SAMBA_2_2 branch.

-- 
Lauri Jesmin (jesmin at ut.ee)
-------------- next part --------------
Index: Makefile.in
===================================================================
RCS file: /cvsroot/samba/source/Makefile.in,v
retrieving revision 1.227.2.126
diff -u -w -r1.227.2.126 Makefile.in
--- Makefile.in	2 Apr 2002 03:43:08 -0000	1.227.2.126
+++ Makefile.in	5 Apr 2002 08:34:06 -0000
@@ -367,6 +367,7 @@
 		lib/util_unistr.o lib/signal.o lib/talloc.o lib/ms_fnmatch.o \
 		lib/util_sock.o lib/smbrun.o lib/util_sec.o lib/snprintf.o \
 		ubiqx/ubi_sLinkList.o libsmb/smbencrypt.o libsmb/smbdes.o \
+		smbd/ssl.o lib/access.o \
 		lib/interfaces.o $(PARAM_OBJ) $(TDB_OBJ) $(PASSDB_OBJ)
 
 PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
@@ -647,7 +648,7 @@
 
 bin/pam_smbpass. at SHLIBEXT@: $(PAM_SMBPASS_OBJ)
 	@echo Linking shared library $@
-	$(SHLD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) $(LIBS) -lc
+	$(SHLD) @LDSHFLAGS@ -symbolic -o $@ $(PAM_SMBPASS_OBJ) $(LDFLAGS) -lpam $(DYNEXP) $(LIBS) -lc
 
 nsswitch/libnss_wins.so: $(NSS_OBJ)
 	@echo "Linking $@"
Index: pam_smbpass/support.c
===================================================================
RCS file: /cvsroot/samba/source/pam_smbpass/support.c,v
retrieving revision 1.1.2.10
diff -u -w -r1.1.2.10 support.c
--- pam_smbpass/support.c	12 Feb 2002 15:56:20 -0000	1.1.2.10
+++ pam_smbpass/support.c	5 Apr 2002 08:34:07 -0000
@@ -62,6 +62,10 @@
 void _cleanup(pam_handle_t *, void *, int);
 char *_pam_delete(register char *);
 
+/* default configuration file location */
+
+pstring servicesf = CONFIGFILE;
+
 /* syslogging function for errors and other information */
 
 void _log_err( int err, const char *format, ... )
@@ -140,6 +144,9 @@
         set( SMB__QUIET, ctrl );
     }
 
+    /* initialize service file location */
+    service_file=servicesf;
+
     /* Run through the arguments once, looking for an alternate smb config
        file location */
     while (i < argc) {
@@ -164,6 +171,8 @@
     if(lp_load(service_file,True,False,False) == False) {
 	_log_err( LOG_ERR, "Error loading service file %s", service_file );
     }
+
+    secrets_init();
 
     if (lp_null_passwords()) {
         set( SMB__NULLOK, ctrl );
Index: pam_smbpass/support.h
===================================================================
RCS file: /cvsroot/samba/source/pam_smbpass/support.h,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 support.h
--- pam_smbpass/support.h	21 Nov 2001 19:40:27 -0000	1.1.2.4
+++ pam_smbpass/support.h	5 Apr 2002 08:34:07 -0000
@@ -48,3 +48,6 @@
 
 extern int _pam_smb_approve_pass(pam_handle_t *, unsigned int, const char *,
 				 const char *);
+
+extern pstring servicesf;
+