[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  17bc0fa Revert "s3: smbd: Tear down global_smbXsrv_client in the correct order."
       via  fbcf1d2 samba-tool: user create examples show 'add' instead of 'create'
      from  4735e5f samba-tool: fsmo.py throws an uncaught exception if no

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 17bc0fab767e59976c6360739d31aa9ad2febc5b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 7 08:55:27 2015 -0800

    Revert "s3: smbd: Tear down global_smbXsrv_client in the correct order."
    
    Wrong fix for the problem that was actually fixed in the dbwrap_rbt
    code with commits:
    
    590507951fc514a679f44b8bfdd03c721189c3fa
    0f46da08e160e6712e5282af14e1ec4012614fc7
    
    This reverts commit 8024e19b70047865249305bceddd4473d6e60051.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Dec  7 21:09:04 CET 2015 on sn-devel-104

commit fbcf1d2b0f2f50a62fc54cb6b509c3325d6ca54c
Author: Rowland Penny <repenny241155 at gmail.com>
Date:   Sat Nov 21 09:16:51 2015 +0000

    samba-tool: user create examples show 'add' instead of 'create'
    
    Signed-off-by: Rowland Penny <repenny241155 at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/netcmd/user.py | 8 ++++----
 source3/smbd/server_exit.c  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index ec91a93..cf640b0 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -52,17 +52,17 @@ Unix (RFC2307) attributes may be added to the user account. Attributes taken fro
 The command may be run from the root userid or another authorized userid.  The -H or --URL= option can be used to execute the command against a remote server.
 
 Example1:
-samba-tool user add User1 passw0rd --given-name=John --surname=Smith --must-change-at-next-login -H ldap://samba.samdom.example.com -Uadministrator%passw1rd
+samba-tool user create User1 passw0rd --given-name=John --surname=Smith --must-change-at-next-login -H ldap://samba.samdom.example.com -Uadministrator%passw1rd
 
 Example1 shows how to create a new user in the domain against a remote LDAP server.  The -H parameter is used to specify the remote target server.  The -U option is used to pass the userid and password authorized to issue the command remotely.
 
 Example2:
-sudo samba-tool user add User2 passw2rd --given-name=Jane --surname=Doe --must-change-at-next-login
+sudo samba-tool user create User2 passw2rd --given-name=Jane --surname=Doe --must-change-at-next-login
 
 Example2 shows how to create a new user in the domain against the local server.   sudo is used so a user may run the command as root.  In this example, after User2 is created, he/she will be forced to change their password when they logon.
 
 Example3:
-samba-tool user add User3 passw3rd --userou='OU=OrgUnit'
+samba-tool user create User3 passw3rd --userou='OU=OrgUnit'
 
 Example3 shows how to create a new user in the OrgUnit organizational unit.
 
@@ -72,7 +72,7 @@ samba-tool user create User4 passw4rd --rfc2307-from-nss --gecos 'some text'
 Example4 shows how to create a new user with Unix UID, GID and login-shell set from the local NSS and GECOS set to 'some text'.
 
 Example5:
-samba-tool user add User5 passw5rd --nis-domain=samdom --unix-home=/home/User5 \
+samba-tool user create User5 passw5rd --nis-domain=samdom --unix-home=/home/User5 \
            --uid-number=10005 --login-shell=/bin/false --gid-number=10000
 
 Example5 shows how to create an RFC2307/NIS domain enabled user account. If
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 80f118a..bf50394 100644
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -221,6 +221,7 @@ static void exit_server_common(enum server_exit_reason how,
 			talloc_free(xconn);
 			DO_PROFILE_INC(disconnect);
 		}
+		TALLOC_FREE(client->sconn);
 	}
 	sconn = NULL;
 	xconn = NULL;


-- 
Samba Shared Repository