[Pkg-samba-maint] r4064 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

tags 598313 pending
thanks

Author: bubulle
Date: 2012-05-08 15:02:07 +0000 (Tue, 08 May 2012)
New Revision: 4064

Added:
   trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Adapt patch in upstream #7499 and stop nss_wins clobbering other
daemon's logfiles. Closes: #598313

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-07 20:17:10 UTC (rev 4063)
+++ trunk/samba/debian/changelog	2012-05-08 15:02:07 UTC (rev 4064)
@@ -1,6 +1,8 @@
 samba (2:3.6.5-2) UNRELEASED; urgency=low
 
   * Make samba-common "Multi-Arch: foreign"
+  * Adapt patch in upstream #7499 and stop nss_wins clobbering other
+    daemon's logfiles. Closes: #598313
 
  -- Christian Perrier <bubulle at debian.org>  Mon, 07 May 2012 22:16:32 +0200
 

Added: trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
===================================================================
--- trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch	                        (rev 0)
+++ trunk/samba/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch	2012-05-08 15:02:07 UTC (rev 4064)
@@ -0,0 +1,46 @@
+Description: nss_wins stop clobbering other daemon's log
+Author: Christian Perrier <bubulle at debian.org>,Buchan Milne 
+Bug-Debian: http://bugs.debian.org/598313
+Forwarded: yes
+
+Index: samba/lib/util/debug.c
+===================================================================
+--- samba.orig/lib/util/debug.c
++++ samba/lib/util/debug.c
+@@ -474,15 +474,17 @@
+ 
+ 	if (state.logtype == DEBUG_FILE) {
+ #ifdef WITH_SYSLOG
+-		const char *p = strrchr_m( prog_name,'/' );
+-		if (p)
+-			prog_name = p + 1;
++		if (prog_name) {
++			const char *p = strrchr_m( prog_name,'/' );
++			if (p)
++				prog_name = p + 1;
+ #ifdef LOG_DAEMON
+-		openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
++			openlog( prog_name, LOG_PID, SYSLOG_FACILITY );
+ #else
+-		/* for old systems that have no facility codes. */
+-		openlog( prog_name, LOG_PID );
++			/* for old systems that have no facility codes. */
++			openlog( prog_name, LOG_PID );
+ #endif
++		}
+ #endif
+ 	}
+ }
+Index: samba/nsswitch/wins.c
+===================================================================
+--- samba.orig/nsswitch/wins.c
++++ samba/nsswitch/wins.c
+@@ -52,7 +52,7 @@
+ 	lp_set_cmdline("log level", "0");
+ 
+ 	TimeInit();
+-	setup_logging("nss_wins",False);
++	setup_logging(NULL,False);
+ 	lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+ 	load_interfaces();
+ }

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-05-07 20:17:10 UTC (rev 4063)
+++ trunk/samba/debian/patches/series	2012-05-08 15:02:07 UTC (rev 4064)
@@ -14,3 +14,4 @@
 bug_221618_precise-64bit-prototype.patch
 initialize_password_db-null-deref
 fix-samba.ldip-syntax.patch
+bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch