[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Oct 14 17:52:02 MDT 2013
The branch, master has been updated
via 54019ca docs: Explain why this option should not be used
via e512491 s3-winbindd: Remove undocumented winbindd:socket dir parameter
via 13495c7 auth4: Remove an unused variable
from 2343df4 talloc: Add a warning to talloc_reference() documentation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 54019ca9aaf9d200c60e8d234259c439875c85f7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Oct 11 13:39:09 2013 +1300
docs: Explain why this option should not be used
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Oct 15 01:51:39 CEST 2013 on sn-devel-104
commit e512491552d9ed0dc1005a23ffc8f77ba237f863
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Oct 11 13:34:13 2013 +1300
s3-winbindd: Remove undocumented winbindd:socket dir parameter
This uses the documeted "winbindd socket directory" parameter instead.
This came about due to the merge of the two smb.conf tables in s3 and
s4 for the Samba 4.0 release. The s4 code used a real parameter,
which caused this to be documented, whereas no automatic procedure
existed to notice the parametric option and the need to document that.
The fact that this was not used consistently in both codebases is one
of the many areas of technical debt we still need to pay off here.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 13495c7eb3a3feac93d81356acdf880d474319a8
Author: Volker Lendecke <vl at samba.org>
Date: Sun Oct 13 13:58:44 2013 +0200
auth4: Remove an unused variable
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.../smbdotconf/winbind/winbinddsocketdirectory.xml | 5 +++++
selftest/target/Samba3.pm | 2 +-
source3/include/proto.h | 1 +
source3/param/loadparm.c | 1 +
source3/winbindd/winbindd.c | 9 ++-------
source3/winbindd/winbindd_proto.h | 1 -
source4/auth/session.c | 1 -
7 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
index 1f8c579..5fd32ff 100644
--- a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
@@ -5,6 +5,11 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This setting controls the location of the winbind daemon's socket.</para>
+ <para>Except within automated test scripts, this should not be
+ altered, as the client tools (nss_winbind etc) do not honour
+ this parameter. Client tools must then be advised of the
+ altered path with the WINBINDD_SOCKET_DIR environment
+ varaible.</para>
</description>
<related>winbindd privileged socket directory</related>
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index fbbddcc..c3a4345 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -968,7 +968,7 @@ sub provision($$$$$$)
printing = bsd
printcap name = /dev/null
- winbindd:socket dir = $wbsockdir
+ winbindd socket directory = $wbsockdir
nmbd:socket dir = $nmbdsockdir
idmap config * : range = 100000-200000
winbind enum users = yes
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 023fbd0..9612a07 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1060,6 +1060,7 @@ char *lp_wins_hook(TALLOC_CTX *ctx);
const char *lp_template_homedir(void);
const char *lp_template_shell(void);
const char *lp_winbind_separator(void);
+const char *lp_winbindd_socket_directory(void);
bool lp_winbind_enum_users(void);
bool lp_winbind_enum_groups(void);
bool lp_winbind_use_default_domain(void);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3daebdb..62cba4d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -959,6 +959,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.szTemplateShell, "/bin/false");
string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
string_set(&Globals.szWinbindSeparator, "\\");
+ string_set(&Globals.szWinbinddSocketDirectory, dyn_WINBINDD_SOCKET_DIR);
string_set(&Globals.szCupsServer, "");
string_set(&Globals.szIPrintServer, "");
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 50573ac..31280c2 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -189,7 +189,7 @@ static void terminate(bool is_parent)
char *path = NULL;
if (asprintf(&path, "%s/%s",
- get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME) > 0) {
+ lp_winbindd_socket_directory(), WINBINDD_SOCKET_NAME) > 0) {
unlink(path);
SAFE_FREE(path);
}
@@ -1031,11 +1031,6 @@ static void winbindd_listen_fde_handler(struct tevent_context *ev,
* Winbindd socket accessor functions
*/
-const char *get_winbind_pipe_dir(void)
-{
- return lp_parm_const_string(-1, "winbindd", "socket dir", get_dyn_WINBINDD_SOCKET_DIR());
-}
-
char *get_winbind_priv_pipe_dir(void)
{
return state_path(WINBINDD_PRIV_SOCKET_SUBDIR);
@@ -1056,7 +1051,7 @@ static bool winbindd_setup_listeners(void)
pub_state->privileged = false;
pub_state->fd = create_pipe_sock(
- get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
+ lp_winbindd_socket_directory(), WINBINDD_SOCKET_NAME, 0755);
if (pub_state->fd == -1) {
goto failed;
}
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 3df7d7c..cfc19d0 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -34,7 +34,6 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground);
bool winbindd_setup_sig_hup_handler(const char *lfile);
bool winbindd_use_idmap_cache(void);
bool winbindd_use_cache(void);
-const char *get_winbind_pipe_dir(void);
char *get_winbind_priv_pipe_dir(void);
struct tevent_context *winbind_event_context(void);
int main(int argc, char **argv, char **envp);
diff --git a/source4/auth/session.c b/source4/auth/session.c
index bb0b5bc..1c0583e 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -148,7 +148,6 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
char *sid_string;
const char *sid_dn;
DATA_BLOB sid_blob;
- int ret;
sid_string = dom_sid_string(tmp_ctx,
&sids[i]);
--
Samba Shared Repository
More information about the samba-cvs
mailing list