[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  76fa5ee samba-tool: Fix typo in --help output.
       via  f8c5f98 s4-drs: Remove unused var
      from  50d47fc s3fs-client: Burn commandline password of client utils.

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


- Log -----------------------------------------------------------------
commit 76fa5ee5d40e7e15c777ef11eb3492bcae7f4f0f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Nov 9 09:07:38 2012 +0100

    samba-tool: Fix typo in --help output.
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Nov  9 11:04:50 CET 2012 on sn-devel-104

commit f8c5f9836415ce0891624b170410e807abcfb706
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Oct 5 02:09:47 2012 -0700

    s4-drs: Remove unused var
    
    Signed-off-by: Matthieu Patou <mat at matws.net>

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

Summary of changes:
 source4/libnet/libnet_vampire.c                   |    3 ---
 source4/scripting/python/samba/netcmd/testparm.py |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 48fdc89..4091346 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -527,7 +527,6 @@ NTSTATUS libnet_vampire_cb_schema_chunk(void *private_data,
 	struct drsuapi_DsReplicaObjectListItemEx *cur;
 	uint32_t nc_linked_attributes_count;
 	uint32_t linked_attributes_count;
-	struct drsuapi_DsReplicaLinkedAttribute *linked_attributes;
 
 	switch (c->ctr_level) {
 	case 1:
@@ -537,7 +536,6 @@ NTSTATUS libnet_vampire_cb_schema_chunk(void *private_data,
 		first_object			= c->ctr1->first_object;
 		nc_linked_attributes_count	= 0;
 		linked_attributes_count		= 0;
-		linked_attributes		= NULL;
 		break;
 	case 6:
 		mapping_ctr			= &c->ctr6->mapping_ctr;
@@ -546,7 +544,6 @@ NTSTATUS libnet_vampire_cb_schema_chunk(void *private_data,
 		first_object			= c->ctr6->first_object;
 		nc_linked_attributes_count	= c->ctr6->nc_linked_attributes_count;
 		linked_attributes_count		= c->ctr6->linked_attributes_count;
-		linked_attributes		= c->ctr6->linked_attributes;
 		break;
 	default:
 		return NT_STATUS_INVALID_PARAMETER;
diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/source4/scripting/python/samba/netcmd/testparm.py
index 53357e4..34c8fa5 100644
--- a/source4/scripting/python/samba/netcmd/testparm.py
+++ b/source4/scripting/python/samba/netcmd/testparm.py
@@ -62,7 +62,7 @@ class cmd_testparm(Command):
         Option("-v", "--verbose", action="store_true",
                default=False, help="Show default options too"),
         # We need support for smb.conf macros before this will work again
-        Option("--server", type=str, help="Set %%L macro to servername"),
+        Option("--server", type=str, help="Set %L macro to servername"),
         # These are harder to do with the new code structure
         Option("--show-all-parameters", action="store_true", default=False,
                help="Show the parameters, type, possible values")


-- 
Samba Shared Repository