[Pkg-samba-maint] [samba] 01/01: patches: Remove unused patch

[Mathieu Parent]

Andrew,

FYI, I've replaced your patch by mine:
https://anonscm.debian.org/cgit/pkg-samba/samba.git/commit/?id=86cf40e6e8c7cca5d4deaf6fdff3989bfcbb70a0

so that git master matches last upload.

Regards

Mathieu


2017-07-19 0:02 GMT+02:00 Andrew Bartlett
<abartlet-guest at moszumanska.debian.org>:
> This is an automated email from the git hooks/post-receive script.
>
> abartlet-guest pushed a commit to branch master
> in repository samba.
>
> commit a8b809a7e00789ecab6f523d9a3bb67b6f349de7
> Author: Andrew Bartlett <abartlet at samba.org>
> Date:   Wed Jul 19 09:58:16 2017 +1200
>
>     patches: Remove unused patch
>
>     This patch, bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
>     is no longer in the series file, as nss_wins was re-written to be a
>     winbind client only, and so will not do any logging (like nss_winbind).
> ---
>  ...m_7499-nss_wins-dont-clobber-daemons-logs.patch | 43 ----------------------
>  1 file changed, 43 deletions(-)
>
> diff --git a/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch b/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
> deleted file mode 100644
> index 794b993..0000000
> --- a/debian/patches/bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -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
> -Bug: https://bugzilla.samba.org/show_bug.cgi?id=7499
> -
> ---- a/lib/util/debug.c
> -+++ b/lib/util/debug.c
> -@@ -475,15 +475,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
> -       }
> - }
> ---- a/nsswitch/wins.c
> -+++ b/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();
> - }
>
> --
> Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
>
>
> _______________________________________________
> Pkg-samba-maint mailing list
> Pkg-samba-maint at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-samba-maint



-- 
Mathieu