The branch, master has been updated via c855a37 winbindd: Remove unused enum ent_type via ced3bcf smbd: Adjust debug level of "No protocol supported" message from 8dc6fbb auth: One const is enough...
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c855a3776130aee4057acc144157c05fea3ee02d Author: Christof Schmitt <c...@samba.org> Date: Thu Sep 8 11:00:46 2016 -0700 winbindd: Remove unused enum ent_type Signed-off-by: Christof Schmitt <c...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Sat Sep 10 18:41:26 CEST 2016 on sn-devel-144 commit ced3bcfb6301cdd608bbb99794c84c23625f61d7 Author: Christof Schmitt <c...@samba.org> Date: Thu Sep 8 14:16:18 2016 -0700 smbd: Adjust debug level of "No protocol supported" message SMB clients only supporting SMB1 connecting to a Samba server that only accepts SMB protocol versions 2 and 3 can spam the logs with the "No protocol supported" message. This is useful information for debugging failed connection attempts, but it should not be in the default log. Adjust it to NOTICE/3. Signed-off-by: Christof Schmitt <c...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/smbd/negprot.c | 2 +- source3/winbindd/winbindd.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index d2e5e2e..bd09b1d 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -710,7 +710,7 @@ void reply_negprot(struct smb_request *req) supported_protocols[protocol].proto_reply_fn(req, choice); DEBUG(3,("Selected protocol %s\n",supported_protocols[protocol].proto_name)); } else { - DEBUG(0,("No protocol supported !\n")); + DBG_NOTICE("No protocol supported !\n"); reply_outbuf(req, 1, 0); SSVAL(req->outbuf, smb_vwv0, choice); } diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h index 441b57f..3d49e66 100644 --- a/source3/winbindd/winbindd.h +++ b/source3/winbindd/winbindd.h @@ -344,12 +344,6 @@ struct winbindd_tdc_domain { uint32_t trust_type; }; -/* Switch for listing users or groups */ -enum ent_type { - LIST_USERS = 0, - LIST_GROUPS, -}; - struct WINBINDD_MEMORY_CREDS { struct WINBINDD_MEMORY_CREDS *next, *prev; const char *username; /* lookup key. */ -- Samba Shared Repository