Hello community,
here is the log from the commit of package pam_smb
checked in at Wed Apr 23 01:49:10 CEST 2008.
--------
--- pam_smb/pam_smb.changes 2008-04-10 13:00:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/pam_smb/pam_smb.changes 2008-04-22 13:10:43.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 22 13:05:09 CEST 2008 - prusnak@suse.cz
+
+- fixed invalid flag conditional (invalid-flag.patch) [bnc#380051]
+- added post/preun/postun scripts for pamsmbd service
+
+-------------------------------------------------------------------
Old:
----
pam_smb-2.0.0rc6-configure.diff
pam_smb-2.0.0rc6-daemon-fix.diff
pam_smb-2.0.0rc6.dif
pam_smb-2.0.0rc6-gcc-fix.diff
New:
----
pam_smb-2.0.0rc6-configure.patch
pam_smb-2.0.0rc6-daemon-fix.patch
pam_smb-2.0.0rc6-gcc-fix.patch
pam_smb-2.0.0rc6-invalid-flag.patch
pam_smb-2.0.0rc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_smb.spec ++++++
--- /var/tmp/diff_new_pack.I27690/_old 2008-04-23 01:48:40.000000000 +0200
+++ /var/tmp/diff_new_pack.I27690/_new 2008-04-23 01:48:40.000000000 +0200
@@ -17,22 +17,24 @@
Group: Productivity/Security
AutoReqProv: on
Version: 2.0.0rc6
-Release: 113
+Release: 115
Summary: A PAM Module for User Authentication using an NT Server
Url: http://www.csn.ul.ie/~airlied/pam_smb/
Source: %{name}-%{version}.tar.bz2
Source1: rc.pamsmbd
Source2: login.example
-Patch: %{name}-%{version}.dif
-Patch2: %{name}-%{version}-daemon-fix.diff
-Patch3: %{name}-%{version}-gcc-fix.diff
-Patch4: %{name}-%{version}-configure.diff
+Patch: %{name}-%{version}.patch
+Patch2: %{name}-%{version}-daemon-fix.patch
+Patch3: %{name}-%{version}-gcc-fix.patch
+Patch4: %{name}-%{version}-configure.patch
Patch5: %{name}-%{version}-array-fix.patch
+Patch6: %{name}-%{version}-invalid-flag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+PreReq: coreutils sed grep diffutils fillup
%description
-pam_smb is a PAM module which allows authentication of UNIX users using
-an NT server.
+Module pam_smb is a PAM module which allows authentication of UNIX
+users using an NT server.
@@ -41,12 +43,13 @@
Dave Airlie
%prep
-%setup -n %{name}-2.0.0-rc6
+%setup -q -n %{name}-2.0.0-rc6
%patch
%patch2
%patch3
%patch4
%patch5
+%patch6
cp %{S:2} .
%build
@@ -54,7 +57,7 @@
libtoolize -f
aclocal
autoconf
-CFLAGS="$RPM_OPT_FLAGS" ./configure --sbindir=/usr/sbin --libdir=/%_lib
+%configure
make
%install
@@ -66,6 +69,16 @@
install -m 755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/pamsmbd
ln -sf ../../etc/init.d/pamsmbd $RPM_BUILD_ROOT/usr/sbin/rcpamsmbd
+%post
+%{fillup_and_insserv pamsmbd}
+
+%preun
+%stop_on_removal pamsmbd
+
+%postun
+%restart_on_update pamsmbd
+%insserv_cleanup
+
%files
%defattr(-,root,root)
%doc CHANGES COPYING README TODO login.example
@@ -78,6 +91,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Apr 22 2008 prusnak@suse.cz
+- fixed invalid flag conditional (invalid-flag.patch) [bnc#380051]
+- added post/preun/postun scripts for pamsmbd service
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
++++++ pam_smb-2.0.0rc6-configure.patch ++++++
--- configure.in
+++ configure.in
@@ -144,7 +144,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
++++++ pam_smb-2.0.0rc6-daemon-fix.patch ++++++
--- pamsmbd/server.c
+++ pamsmbd/server.c
@@ -98,6 +98,9 @@
switch(fork())
{
case 0:
+ freopen("/dev/null", "r", stdin);
+ freopen("/dev/null", "w", stdout);
+ freopen("/dev/null", "w", stderr);
break;
case -1:
printf("error in fork\n");
++++++ pam_smb-2.0.0rc6-gcc-fix.patch ++++++
--- pamsmbd/md5.c
+++ pamsmbd/md5.c
@@ -38,6 +38,7 @@
1999-05-03 lpd Original version.
*/
+#include
#include "md5.h"
#ifdef TEST
--- pamsmbd/md5driver.c
+++ pamsmbd/md5driver.c
@@ -38,6 +38,7 @@
*/
#include
+#include
#include "constants.h"
#include "md5.h"
#include "md5driver.h"
--- pamsmbd/server.c
+++ pamsmbd/server.c
@@ -43,6 +43,8 @@
#include
#include
+#include
+
#include "pamsmbd.h"
void sighup_handler(int signum);
--- pamsmbm/support.c
+++ pamsmbm/support.c
@@ -134,8 +134,9 @@
{
int retval;
struct pam_conv *conv;
-
- retval = pam_get_item( pamh, PAM_CONV, (const void **) &conv ) ;
+ struct pam_conv **ptr_conv = &conv;
+
+ retval = pam_get_item( pamh, PAM_CONV, (const void **) ptr_conv ) ;
if ( retval == PAM_SUCCESS )
{
retval = conv->conv( nargs,
--- smbval/smblib-util.c
+++ smbval/smblib-util.c
@@ -30,6 +30,7 @@
#include
#endif
+#include
#include "rfcnb.h"
int RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt);
@@ -793,5 +794,5 @@
}
}
-
+ return 1;
}
++++++ pam_smb-2.0.0rc6-invalid-flag.patch ++++++
--- pamsmbm/pam_smb_auth.c
+++ pamsmbm/pam_smb_auth.c
@@ -264,7 +264,7 @@
if (!unknown_user)
{
if ( ( !pw->pw_passwd ) && ( !p ) )
- if ( flags && PAM_DISALLOW_NULL_AUTHTOK )
+ if ( flags & PAM_DISALLOW_NULL_AUTHTOK )
return PAM_SUCCESS;
pp = crypt(p, salt);
++++++ pam_smb-2.0.0rc6.dif -> pam_smb-2.0.0rc6.patch ++++++
++++++ rc.pamsmbd ++++++
--- pam_smb/rc.pamsmbd 2003-12-02 12:26:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/pam_smb/rc.pamsmbd 2008-04-22 13:08:50.000000000 +0200
@@ -12,10 +12,11 @@
#
### BEGIN INIT INFO
# Provides: pamsmbd
-# Required-Start: $network $syslog $local_fs
+# Required-Start: $network $syslog $local_fs $remote_fs
# Required-Stop: $network $syslog $local_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
+# Short-Description: daemon portion of pam_smb
# Description: daemon portion of pam_smb allows user auth against SMB servers
### END INIT INFO
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
