rpms/samba/F-7 samba-3.0.25a-pam_smbpass.patch, 1.1, 1.2 samba.spec, 1.120, 1.121

[Guenther Deschner (gd)]

Author: gd

Update of /cvs/pkgs/rpms/samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25044

Modified Files:
	samba-3.0.25a-pam_smbpass.patch samba.spec 
Log Message:
Fix pam_smbpass patch.

Guenther


samba-3.0.25a-pam_smbpass.patch:

Index: samba-3.0.25a-pam_smbpass.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba-3.0.25a-pam_smbpass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.0.25a-pam_smbpass.patch	25 May 2007 17:31:57 -0000	1.1
+++ samba-3.0.25a-pam_smbpass.patch	29 May 2007 15:44:15 -0000	1.2
@@ -16,44 +16,20 @@
 ===================================================================
 --- source/Makefile.in	(revision 23120)
 +++ source/Makefile.in	(revision 23121)
-@@ -751,9 +751,9 @@
+@@ -750,10 +750,10 @@
+ 	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
  
  PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
- 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
+-		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
 -		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
++		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
 +PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
  		$(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
 -		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
 +		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(ERRORMAP_OBJ)
  
- IDMAP_OBJ     = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@ 
-
-Index: source/pam_smbpass/pam_smb_auth.c
-===================================================================
---- source/pam_smbpass/pam_smb_auth.c	(revision 23120)
-+++ source/pam_smbpass/pam_smb_auth.c	(revision 23121)
-@@ -109,7 +109,7 @@
- 		_log_err( LOG_DEBUG, "username [%s] obtained", name );
- 	}
- 
--	if (!initialize_password_db(True)) {
-+	if (!initialize_password_db(True, NULL)) {
- 		_log_err( LOG_ALERT, "Cannot access samba password database" );
- 		retval = PAM_AUTHINFO_UNAVAIL;
- 		AUTH_RETURN;
-Index: source/pam_smbpass/pam_smb_passwd.c
-===================================================================
---- source/pam_smbpass/pam_smb_passwd.c	(revision 23120)
-+++ source/pam_smbpass/pam_smb_passwd.c	(revision 23121)
-@@ -137,7 +137,7 @@
-        from a SIGPIPE it's not expecting */
-     oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
+ IDMAP_OBJ     = nsswitch/idmap.o nsswitch/idmap_cache.o nsswitch/idmap_util.o @IDMAP_STATIC@
  
--    if (!initialize_password_db(False)) {
-+    if (!initialize_password_db(False, NULL)) {
-         _log_err( LOG_ALERT, "Cannot access samba password database" );
-         CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-         return PAM_AUTHINFO_UNAVAIL;
 Index: source/pam_smbpass/general.h
 ===================================================================
 --- source/pam_smbpass/general.h	(revision 23120)
@@ -67,17 +43,3 @@
      char *agent;                /* attempt from user with name */
      int count;                  /* number of failures so far */
  };
-Index: source/pam_smbpass/pam_smb_acct.c
-===================================================================
---- source/pam_smbpass/pam_smb_acct.c	(revision 23120)
-+++ source/pam_smbpass/pam_smb_acct.c	(revision 23121)
-@@ -81,7 +81,7 @@
- 	/* Getting into places that might use LDAP -- protect the app
- 		from a SIGPIPE it's not expecting */
- 	oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
--	if (!initialize_password_db(True)) {
-+	if (!initialize_password_db(True, NULL)) {
- 		_log_err( LOG_ALERT, "Cannot access samba password database" );
- 		CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- 		return PAM_AUTHINFO_UNAVAIL;
-


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- samba.spec	25 May 2007 17:31:58 -0000	1.120
+++ samba.spec	29 May 2007 15:44:15 -0000	1.121
@@ -2,7 +2,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.25a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -631,6 +631,9 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue May 29 2007 Günther Deschner <gdeschner at redhat.com>
+- fix pam_smbpass patch.
+
 * Fri May 25 2007 Simo Sorce <ssorce at redhat.com>
 - update to 3.0.25a as it contains many fixes
 - add a fix for pam_smbpass made by Günther but committed upstream after 3.0.25a was cut.