From 8fd3a7c43e925e452b7738c50811d8a00b35babb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Dec 2007 09:53:42 +0100 Subject: libads: fix typo metze (This used to be commit b55b19190d9c1199be13727a75a5936d6f5f15a8) --- source3/libads/sasl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 3b3838e390..798d0b4365 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -329,7 +329,7 @@ static ADS_STATUS ads_sasl_gssapi_unwrap(ADS_STRUCT *ads) return ADS_ERROR_NT(NT_STATUS_ACCESS_DENIED); } - if (wrapped.length < wrapped.length) { + if (wrapped.length < unwrapped.length) { return ADS_ERROR_NT(NT_STATUS_INTERNAL_ERROR); } -- cgit From ef42d66cd085d84d169618a9d58006df2680f3ec Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Dec 2007 09:55:32 +0100 Subject: printing: remove emtpy print_test.c metze (This used to be commit 178afff8791992aee78869f17458dca0956bc116) --- source3/printing/print_test.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 source3/printing/print_test.c (limited to 'source3') diff --git a/source3/printing/print_test.c b/source3/printing/print_test.c deleted file mode 100644 index e69de29bb2..0000000000 -- cgit From a5c0558e4711a48ce0397d739328e6ddd4d28d43 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 6 Dec 2007 12:29:52 +0100 Subject: Remove trailing slashes from service name (This used to be commit a9b686bfdcf993d5423875543f154607836ac143) --- source3/client/client.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3') diff --git a/source3/client/client.c b/source3/client/client.c index a65906c21a..ed33d42081 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -3937,6 +3937,7 @@ static int do_message_op(void) int main(int argc,char *argv[]) { pstring base_directory; + int len = 0; int opt; pstring query_host; bool message = False; @@ -4149,6 +4150,12 @@ static int do_message_op(void) poptPrintUsage(pc, stderr, 0); exit(1); } + /* Remove trailing slashes */ + len = strlen(service); + while(len > 0 && service[len - 1] == '\\') { + --len; + service[len] = '\0'; + } } if ( strlen(new_workgroup) != 0 ) -- cgit From d8ac0cecaeed2da19a286fcb4392bc6fbb10cd8b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 6 Dec 2007 13:51:25 +0100 Subject: Remove an incredible amount of whitespace. Sorry - could not resist. Michael (This used to be commit 1000c98eae0886dbdf60beb1fe64d66ec009746b) --- source3/libads/ldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index a4ba3760c2..da4227b64c 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -42,7 +42,7 @@ #define LDAP_SERVER_TREE_DELETE_OID "1.2.840.113556.1.4.805" static SIG_ATOMIC_T gotalarm; - + /*************************************************************** Signal function to tell us we timed out. ****************************************************************/ -- cgit From bf80f40ca4bcbf0b5f5d3f7f988f121d29fd3edf Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 6 Dec 2007 13:54:45 +0100 Subject: Make output of net getdomainsid more meaningful. Unify spelling of SID. Display usage if superfluous arguments are given. Karolin (This used to be commit cb3a2dfeb047d45bb9eec8cb97d3ba288f21887e) --- source3/utils/net.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/utils/net.c b/source3/utils/net.c index dc4c9da3aa..e8fb2c4987 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -715,10 +715,15 @@ static int net_getdomainsid(int argc, const char **argv) DOM_SID domain_sid; fstring sid_str; + if (argc > 0) { + d_printf("usage: net getdomainsid\n"); + return 1; + } + if(!initialize_password_db(False, NULL)) { - DEBUG(0, ("WARNING: Could not open passdb - domain sid may " + DEBUG(0, ("WARNING: Could not open passdb - domain SID may " "not reflect passdb\n" - "backend knowledge (such as the sid stored in " + "backend knowledge (such as the SID stored in " "LDAP)\n")); } @@ -739,7 +744,7 @@ static int net_getdomainsid(int argc, const char **argv) return 1; } sid_to_string(sid_str, &domain_sid); - d_printf("SID for domain %s is: %s\n", global_myname(), sid_str); + d_printf("SID for local machine %s is: %s\n", global_myname(), sid_str); if (!secrets_fetch_domain_sid(opt_workgroup, &domain_sid)) { d_fprintf(stderr, "Could not fetch domain SID\n"); -- cgit