[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Feb 1 11:20:02 MST 2011
The branch, master has been updated
via ff0f633 s3:rpcclient/cmd_samr: remove useless ';'
via a152f20 s3:libnet/libnet_samsync_display: fix netr_DELTA_* display
via 5e4691e s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display
via 34b7b55 pidl:Samba4/NDR/Parser: fix ndr_pull/ndr_push mismatch
from 1c9cf16 s3: Fix the build on sles8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ff0f63329a884d74d088436958b963787426dc7c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 1 17:38:02 2011 +0100
s3:rpcclient/cmd_samr: remove useless ';'
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Tue Feb 1 19:19:24 CET 2011 on sn-devel-104
commit a152f20dd10288ce51ac987af8fb87ab30eb5654
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 1 17:37:13 2011 +0100
s3:libnet/libnet_samsync_display: fix netr_DELTA_* display
metze
commit 5e4691e70e92e12dd08e88f6abd046637f7b4210
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 1 17:36:33 2011 +0100
s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display
metze
commit 34b7b552e85fddedf012af90eb13a4cfdcc16a74
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 1 13:10:04 2011 +0100
pidl:Samba4/NDR/Parser: fix ndr_pull/ndr_push mismatch
metze
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 +-
source3/libnet/libnet_samsync_display.c | 21 ++++++++++++---------
source3/rpcclient/cmd_netlogon.c | 25 ++++++++++++++-----------
source3/rpcclient/cmd_samr.c | 2 +-
4 files changed, 28 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 69c1386..075ad85 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1857,7 +1857,7 @@ sub ParseUnionPullPrimitives($$$$$)
if (defined($e->{ALIGN})) {
if ($e->{IS_MS_UNION}) {
$self->pidl("/* ms_union is always aligned to the largest union arm*/");
- $self->pidl("NDR_CHECK(ndr_push_align($ndr, $e->{ALIGN}));");
+ $self->pidl("NDR_CHECK(ndr_pull_align($ndr, $e->{ALIGN}));");
} else {
$self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));");
}
diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index eb891cf..f2cff78 100644
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -206,29 +206,32 @@ static NTSTATUS display_sam_entry(TALLOC_CTX *mem_ctx,
display_alias_mem(id.rid, u.alias_member);
break;
case NETR_DELTA_POLICY:
- printf("Policy\n");
+ printf("Policy: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_TRUSTED_DOMAIN:
printf("Trusted Domain: %s\n",
u.trusted_domain->domain_name.string);
break;
case NETR_DELTA_DELETE_TRUST:
- printf("Delete Trust: %d\n",
- u.delete_trust.unknown);
+ printf("Delete Trust: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_ACCOUNT:
- printf("Account\n");
+ printf("Account: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_DELETE_ACCOUNT:
- printf("Delete Account: %d\n",
- u.delete_account.unknown);
+ printf("Delete Account: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_SECRET:
- printf("Secret\n");
+ printf("Secret: %s\n",
+ id.name);
break;
case NETR_DELTA_DELETE_SECRET:
- printf("Delete Secret: %d\n",
- u.delete_secret.unknown);
+ printf("Delete Secret: %s\n",
+ id.name);
break;
case NETR_DELTA_DELETE_GROUP2:
printf("Delete Group2: %s\n",
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index c909efe..63057ac 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -478,7 +478,7 @@ static void display_sam_sync(struct netr_DELTA_ENUM_ARRAY *r)
break;
case NETR_DELTA_DELETE_GROUP:
printf("Delete Group: %d\n",
- u.delete_account.unknown);
+ id.rid);
break;
case NETR_DELTA_RENAME_GROUP:
printf("Rename Group: %s -> %s\n",
@@ -511,7 +511,7 @@ static void display_sam_sync(struct netr_DELTA_ENUM_ARRAY *r)
break;
case NETR_DELTA_DELETE_ALIAS:
printf("Delete Alias: %d\n",
- r->delta_enum[i].delta_id_union.rid);
+ id.rid);
break;
case NETR_DELTA_RENAME_ALIAS:
printf("Rename alias: %s -> %s\n",
@@ -527,29 +527,32 @@ static void display_sam_sync(struct netr_DELTA_ENUM_ARRAY *r)
}
break;
case NETR_DELTA_POLICY:
- printf("Policy\n");
+ printf("Policy: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_TRUSTED_DOMAIN:
printf("Trusted Domain: %s\n",
u.trusted_domain->domain_name.string);
break;
case NETR_DELTA_DELETE_TRUST:
- printf("Delete Trust: %d\n",
- u.delete_trust.unknown);
+ printf("Delete Trust: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_ACCOUNT:
- printf("Account\n");
+ printf("Account: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_DELETE_ACCOUNT:
- printf("Delete Account: %d\n",
- u.delete_account.unknown);
+ printf("Delete Account: %s\n",
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_SECRET:
- printf("Secret\n");
+ printf("Secret: %s\n",
+ id.name);
break;
case NETR_DELTA_DELETE_SECRET:
- printf("Delete Secret: %d\n",
- u.delete_secret.unknown);
+ printf("Delete Secret: %s\n",
+ id.name);
break;
case NETR_DELTA_DELETE_GROUP2:
printf("Delete Group2: %s\n",
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 4c1dc90..727c9d1 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -2055,7 +2055,7 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli,
uint32 num_names;
struct samr_Ids rids, name_types;
int i;
- struct lsa_String *names = NULL;;
+ struct lsa_String *names = NULL;
struct dcerpc_binding_handle *b = cli->binding_handle;
if (argc < 3) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list