sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-19 10:03:58 +03:00
Code

Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Browse Source
This commit is contained in:
Jeremy Allison 2007-12-06 11:17:37 -08:00
commit 48252d124d
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/client/client.c
View File

@ -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 )

2
source/libads/ldap.c
View File

@ -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.
****************************************************************/

2
source/libads/sasl.c
View File

@ -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);
}

0
source/printing/print_test.c
View File

11
source/utils/net.c
View File

@ -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");