[Pkg-samba-maint] r1794 - in branches/samba/experimental/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-25 11:01:37 +0000 (Tue, 25 Mar 2008)
New Revision: 1794

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
Log:
* debian/patches/smbpasswd-syslog.patch: updated to account for new
  calls to logging functions

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-03-25 08:53:53 UTC (rev 1793)
+++ branches/samba/experimental/debian/changelog	2008-03-25 11:01:37 UTC (rev 1794)
@@ -31,6 +31,8 @@
     - debian/patches/fhs-assignpaths.patch: patch source/m4/check_path.m4
       instead of source/configure.in.
   * debian/patches/smbstatus-locking.patch: merged upstream
+  * debian/patches/smbpasswd-syslog.patch: updated to account for new
+    calls to logging functions
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 05 Mar 2008 22:45:28 +0100
 

Modified: branches/samba/experimental/debian/patches/smbpasswd-syslog.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbpasswd-syslog.patch	2008-03-25 08:53:53 UTC (rev 1793)
+++ branches/samba/experimental/debian/patches/smbpasswd-syslog.patch	2008-03-25 11:01:37 UTC (rev 1794)
@@ -450,7 +450,7 @@
  
      /*
       * First get the name of a user.  No need to do anything if we can't
-@@ -121,12 +120,12 @@
+@@ -121,16 +120,16 @@
      retval = pam_get_user( pamh, &user, "Username: " );
      if (retval != PAM_SUCCESS) {
          if (on( SMB_DEBUG, ctrl )) {
@@ -465,6 +465,11 @@
      }
  
      if (geteuid() != 0) {
+-	_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
++	_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
+ 	return PAM_AUTHINFO_UNAVAIL;
+     }
+ 
 @@ -139,7 +138,7 @@
      oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);