svn commit: samba r25145 - in branches/SAMBA_3_2_0/source/nsswitch: .

[metze at samba.org]

Author: metze
Date: 2007-09-14 07:52:19 +0000 (Fri, 14 Sep 2007)
New Revision: 25145

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25145

Log:
merge some missing changes from SAMBA_3_2

metze
Modified:
   branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h
   branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h
   branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h


Changeset:
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h	2007-09-14 07:21:18 UTC (rev 25144)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbind_nss.h	2007-09-14 07:52:19 UTC (rev 25145)
@@ -37,8 +37,7 @@
  * Linux (glibc)
  */
 
-#include <nss.h>
-typedef enum nss_status NSS_STATUS;
+#include "nsswitch/winbind_nss_linux.h"
 
 #elif HAVE_NS_API_H
 

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h	2007-09-14 07:21:18 UTC (rev 25144)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbind_nss_linux.h	2007-09-14 07:52:19 UTC (rev 25145)
@@ -22,12 +22,8 @@
 #ifndef _WINBIND_NSS_LINUX_H
 #define _WINBIND_NSS_LINUX_H
 
-#if HAVE_NSS_H
-
 #include <nss.h>
 
 typedef enum nss_status NSS_STATUS;
 
-#endif /* HAVE_NSS_H */
-
 #endif /* _WINBIND_NSS_LINUX_H */

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h	2007-09-14 07:21:18 UTC (rev 25144)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h	2007-09-14 07:52:19 UTC (rev 25145)
@@ -19,7 +19,14 @@
 #define _WINBINDD_NTDOM_H
 
 #define WINBINDD_SOCKET_NAME "pipe"            /* Name of PF_UNIX socket */
+
+/* Let the build environment override the public winbindd socket location. This
+ * is needed for launchd support -- jpeach.
+ */
+#ifndef WINBINDD_SOCKET_DIR
 #define WINBINDD_SOCKET_DIR  "/tmp/.winbindd"  /* Name of PF_UNIX dir */
+#endif
+
 #define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  "WINBINDD_DOMAIN" /* Environment variables */
 #define WINBINDD_DONT_ENV    "_NO_WINBINDD"