Build status as of Sat Mar 10 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-03-09 00:00:52.0 + +++ /home/build/master/cache/broken_results.txt 2007-03-10 00:01:25.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Mar 9 00:00:03 2007 +Build status as of Sat Mar 10 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -17,8 +17,8 @@ samba-docs 0 0 0 samba-gtk4 4 0 samba4 38 15 0 -samba_3_040 15 1 +samba_3_040 14 1 smb-build29 29 0 -talloc 35 1 0 +talloc 34 1 0 tdb 32 3 0
svn commit: samba r21781 - in branches/SAMBA_3_0_25: examples/VFS source source/include source/modules source/smbd
Author: jpeach Date: 2007-03-09 23:57:53 + (Fri, 09 Mar 2007) New Revision: 21781 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21781 Log: Add support for the UNIX_INFO2 info level. Merge the following SAMBA_3_0 revisions: r21756:21757 r21761:21762 r21762:21763 r21764:21767 Added: branches/SAMBA_3_0_25/examples/VFS/config.guess branches/SAMBA_3_0_25/examples/VFS/config.sub Modified: branches/SAMBA_3_0_25/examples/VFS/Makefile.in branches/SAMBA_3_0_25/examples/VFS/configure.in branches/SAMBA_3_0_25/examples/VFS/skel_opaque.c branches/SAMBA_3_0_25/examples/VFS/skel_transparent.c branches/SAMBA_3_0_25/source/configure.in branches/SAMBA_3_0_25/source/include/trans2.h branches/SAMBA_3_0_25/source/include/vfs.h branches/SAMBA_3_0_25/source/include/vfs_macros.h branches/SAMBA_3_0_25/source/modules/vfs_default.c branches/SAMBA_3_0_25/source/modules/vfs_full_audit.c branches/SAMBA_3_0_25/source/smbd/trans2.c Changeset: Sorry, the patch is too large (851 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21781
svn commit: samba r21780 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_25/source/utils
Author: herb
Date: 2007-03-09 19:48:50 + (Fri, 09 Mar 2007)
New Revision: 21780
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21780
Log:
let smbcontrol use POPT_COMMON_SAMBA options to allow setting debug
level. Fix calculation of argc after options are stripped. I couldn't
find a popt function that returned this.
Modified:
branches/SAMBA_3_0/source/utils/smbcontrol.c
branches/SAMBA_3_0_25/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_0/source/utils/smbcontrol.c2007-03-09 19:28:35 UTC
(rev 21779)
+++ branches/SAMBA_3_0/source/utils/smbcontrol.c2007-03-09 19:48:50 UTC
(rev 21780)
@@ -1145,25 +1145,15 @@
poptContext pc;
int opt;
- static struct poptOption wbinfo_options[] = {
+ static struct poptOption long_options[] = {
+ POPT_AUTOHELP
{ "timeout", 't', POPT_ARG_INT, &timeout, 't',
"Set timeout value in seconds", "TIMEOUT" },
- { "configfile", 's', POPT_ARG_STRING, NULL, 's',
- "Use alternative configuration file", "CONFIGFILE" },
-
+ POPT_COMMON_SAMBA
POPT_TABLEEND
};
- struct poptOption options[] = {
- { NULL, 0, POPT_ARG_INCLUDE_TABLE, wbinfo_options, 0,
- "Options" },
-
- POPT_AUTOHELP
- POPT_COMMON_VERSION
- POPT_TABLEEND
- };
-
load_case_tables();
setup_logging(argv[0],True);
@@ -1171,7 +1161,7 @@
/* Parse command line arguments using popt */
pc = poptGetContext(
- "smbcontrol", argc, (const char **)argv, options, 0);
+ "smbcontrol", argc, (const char **)argv, long_options, 0);
poptSetOtherOptionHelp(pc, "[OPTION...] "
"");
@@ -1182,12 +1172,7 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
case 't': /* --timeout */
- argc -= 2;
break;
- case 's': /* --configfile */
- pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
- argc -= 2;
- break;
default:
fprintf(stderr, "Invalid option\n");
poptPrintHelp(pc, stderr, 0);
@@ -1200,7 +1185,10 @@
correct value in the above switch statement. */
argv = (const char **)poptGetArgs(pc);
- argc--; /* Don't forget about argv[0] */
+ argc = 0;
+ while (argv[argc] != NULL) {
+ argc++;
+ }
if (argc == 1)
usage(&pc);
Modified: branches/SAMBA_3_0_25/source/utils/smbcontrol.c
===
--- branches/SAMBA_3_0_25/source/utils/smbcontrol.c 2007-03-09 19:28:35 UTC
(rev 21779)
+++ branches/SAMBA_3_0_25/source/utils/smbcontrol.c 2007-03-09 19:48:50 UTC
(rev 21780)
@@ -1145,25 +1145,15 @@
poptContext pc;
int opt;
- static struct poptOption wbinfo_options[] = {
+ static struct poptOption long_options[] = {
+ POPT_AUTOHELP
{ "timeout", 't', POPT_ARG_INT, &timeout, 't',
"Set timeout value in seconds", "TIMEOUT" },
- { "configfile", 's', POPT_ARG_STRING, NULL, 's',
- "Use alternative configuration file", "CONFIGFILE" },
-
+ POPT_COMMON_SAMBA
POPT_TABLEEND
};
- struct poptOption options[] = {
- { NULL, 0, POPT_ARG_INCLUDE_TABLE, wbinfo_options, 0,
- "Options" },
-
- POPT_AUTOHELP
- POPT_COMMON_VERSION
- POPT_TABLEEND
- };
-
load_case_tables();
setup_logging(argv[0],True);
@@ -1171,7 +1161,7 @@
/* Parse command line arguments using popt */
pc = poptGetContext(
- "smbcontrol", argc, (const char **)argv, options, 0);
+ "smbcontrol", argc, (const char **)argv, long_options, 0);
poptSetOtherOptionHelp(pc, "[OPTION...] "
"");
@@ -1182,12 +1172,7 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch(opt) {
case 't': /* --timeout */
- argc -= 2;
break;
- case 's': /* --configfile */
- pstrcpy(dyn_CONFIGFILE, poptGetOptArg(pc));
- argc -= 2;
- break;
default:
fprintf(stderr, "Invalid option\n");
poptPrintHelp(pc, stderr, 0);
@@ -1200,7 +1185,10 @@
correct value in th
svn commit: samba r21779 - in branches/SAMBA_3_0/source/libads: .
Author: jpeach
Date: 2007-03-09 19:28:35 + (Fri, 09 Mar 2007)
New Revision: 21779
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21779
Log:
I missd a call to krb5_get_init_creds_opt_alloc in r21778.
Modified:
branches/SAMBA_3_0/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2007-03-09 18:51:48 UTC (rev
21778)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2007-03-09 19:28:35 UTC (rev
21779)
@@ -101,7 +101,7 @@
return code;
}
- code = krb5_get_init_creds_opt_alloc(ctx, &opt);
+ code = smb_krb5_get_init_creds_opt_alloc(ctx, &opt);
if (code) {
krb5_cc_close(ctx, cc);
krb5_free_context(ctx);
Re: svn commit: samba r21768 - in branches: SAMBA_3_0/source/client SAMBA_3_0/source/include SAMBA_3_0/source/lib SAMBA_3_0/source/libsmb SAMBA_3_0/source/utils SAMBA_3_0_25/source/client SAMBA_3_0_25
On Fri, Mar 09, 2007 at 07:41:28AM +0100, Stefan (metze) Metzmacher wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > [EMAIL PROTECTED] schrieb: > > Author: jra > > Date: 2007-03-08 23:54:57 + (Thu, 08 Mar 2007) > > New Revision: 21768 > > > > WebSVN: > > http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21768 > > > > Log: > > Fix the client dfs code such that smbclient can > > process deep dfs links (ie. links that go to non root > > parts of a share). Make the directory handling conanonical > > in POSIX and Windows pathname processing. > > dfs should not be fully working in client tools. Please > > bug me if not. > > Jeremy. > > you mean this?: > > dfs should *now* be fully working in client tools. Please > bug me if not. Errr, yes. Read what I mean, not what I say :-). Thanks, Jeremy.
svn commit: samba r21778 - in branches/SAMBA_3_0/source: . include libads libsmb
Author: jpeach
Date: 2007-03-09 18:51:48 + (Fri, 09 Mar 2007)
New Revision: 21778
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21778
Log:
Wrap calls to krb5_get_init_creds_opt_free to handle the different
calling convention in the latest MIT changes. Apparantly Heimdal
is also changing to this calling convention.
Modified:
branches/SAMBA_3_0/source/configure.in
branches/SAMBA_3_0/source/include/includes.h
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libsmb/clikrb5.c
Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===
--- branches/SAMBA_3_0/source/configure.in 2007-03-09 18:33:16 UTC (rev
21777)
+++ branches/SAMBA_3_0/source/configure.in 2007-03-09 18:51:48 UTC (rev
21778)
@@ -3549,6 +3549,26 @@
[Whether the krb5_ticket structure contains the kvno and enctype])
fi
+ AC_CACHE_CHECK(whether krb5_get_init_creds_opt_free takes a context argument,
+ smb_krb5_creds_opt_free_context,
+ [
+ AC_TRY_COMPILE([
+ #include ],
+ [
+ krb5_context ctx;
+ krb5_get_init_creds_opt *opt = NULL;
+ krb5_get_init_creds_opt_free(ctx, opt);
+ ],
+ [smb_krb5_creds_opt_free_context=yes],
+ [smb_krb5_creds_opt_free_context=no]
+ )
+ ])
+
+ if test x"$smb_krb5_creds_opt_free_context" = x"yes" ; then
+ AC_DEFINE(KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT, 1,
+ [Whether krb5_get_init_creds_opt_free takes a context argument])
+ fi
+
AC_CACHE_CHECK(whether krb5_verify_checksum takes 7 arguments,
smb_krb5_verify_checksum, [
AC_TRY_COMPILE([
#include ],
Modified: branches/SAMBA_3_0/source/include/includes.h
===
--- branches/SAMBA_3_0/source/include/includes.h2007-03-09 18:33:16 UTC
(rev 21777)
+++ branches/SAMBA_3_0/source/include/includes.h2007-03-09 18:51:48 UTC
(rev 21778)
@@ -1176,8 +1176,11 @@
void smb_krb5_free_error(krb5_context context, krb5_error *krberror);
krb5_error_code handle_krberror_packet(krb5_context context,
krb5_data *packet);
-void krb5_get_init_creds_opt_free(krb5_get_init_creds_opt *opt);
-krb5_error_code krb5_get_init_creds_opt_alloc(krb5_context context,
krb5_get_init_creds_opt **opt);
+
+void smb_krb5_get_init_creds_opt_free(krb5_context context,
+ krb5_get_init_creds_opt *opt);
+krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
+ krb5_get_init_creds_opt **opt);
#endif /* HAVE_KRB5 */
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2007-03-09 18:33:16 UTC (rev
21777)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2007-03-09 18:51:48 UTC (rev
21778)
@@ -140,7 +140,7 @@
if ((code = krb5_get_init_creds_password(ctx, &my_creds, me,
CONST_DISCARD(char *,password),
kerb_prompter, NULL, 0, NULL,
opt)))
{
- krb5_get_init_creds_opt_free(opt);
+ smb_krb5_get_init_creds_opt_free(ctx, opt);
smb_krb5_free_addresses(ctx, addr);
krb5_cc_close(ctx, cc);
krb5_free_principal(ctx, me);
@@ -148,7 +148,7 @@
return code;
}
- krb5_get_init_creds_opt_free(opt);
+ smb_krb5_get_init_creds_opt_free(ctx, opt);
if ((code = krb5_cc_initialize(ctx, cc, me))) {
smb_krb5_free_addresses(ctx, addr);
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-03-09 18:33:16 UTC (rev
21777)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c 2007-03-09 18:51:48 UTC (rev
21778)
@@ -1389,9 +1389,14 @@
return ret;
}
-#ifndef HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC
- krb5_error_code krb5_get_init_creds_opt_alloc(krb5_context context,
krb5_get_init_creds_opt **opt)
+ krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
+ krb5_get_init_creds_opt **opt)
{
+#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC
+ /* Heimdal or modern MIT version */
+ return krb5_get_init_creds_opt_alloc(context, opt);
+#else
+ /* Historical MIT version */
krb5_get_init_creds_opt *my_opt;
*opt = NULL;
@@ -1404,16 +1409,28 @@
*opt = my_opt;
return 0;
+#endif /* HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC */
}
+
+ void smb_krb5_get_init_creds_opt_free(krb5_context context,
+
svn commit: samba r21777 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/libsmb SAMBA_3_0/source/smbd SAMBA_3_0_25/source/include SAMBA_3_0_25/source/libsmb SAMBA_3_0_25/source/smbd
Author: jra
Date: 2007-03-09 18:33:16 + (Fri, 09 Mar 2007)
New Revision: 21777
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21777
Log:
As Stevef requested and the Apple guys agreed, make
mode_t in posix_open/posix_mkdir -> 8 bytes to match
the SET_UNIX_INFO_BASIC call. Steve is updating the
Wikki.
Jeremy.
Modified:
branches/SAMBA_3_0/source/include/trans2.h
branches/SAMBA_3_0/source/libsmb/clifile.c
branches/SAMBA_3_0/source/smbd/trans2.c
branches/SAMBA_3_0_25/source/include/trans2.h
branches/SAMBA_3_0_25/source/libsmb/clifile.c
branches/SAMBA_3_0_25/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/trans2.h
===
--- branches/SAMBA_3_0/source/include/trans2.h 2007-03-09 16:55:56 UTC (rev
21776)
+++ branches/SAMBA_3_0/source/include/trans2.h 2007-03-09 18:33:16 UTC (rev
21777)
@@ -717,8 +717,8 @@
/* Definition of request data block for SMB_POSIX_PATH_OPEN */
/*
[4 bytes] flags (as smb_ntcreate_Flags).
- [4 bytes] open_mode
- [4 bytes] mode_t - same encoding as "Standard UNIX permissions"
above.
+ [4 bytes] open_mode - SMB_O_xxx flags above.
+ [8 bytes] mode_t (permissions) - same encoding as "Standard UNIX
permissions" above in SMB_SET_FILE_UNIX_BASIC.
[2 bytes] ret_info_level - optimization. Info level to be returned.
*/
Modified: branches/SAMBA_3_0/source/libsmb/clifile.c
===
--- branches/SAMBA_3_0/source/libsmb/clifile.c 2007-03-09 16:55:56 UTC (rev
21776)
+++ branches/SAMBA_3_0/source/libsmb/clifile.c 2007-03-09 18:33:16 UTC (rev
21777)
@@ -1839,7 +1839,7 @@
unsigned int param_len = 0;
uint16 setup = TRANSACT2_SETPATHINFO;
char param[sizeof(pstring)+6];
- char data[14];
+ char data[18];
char *rparam=NULL, *rdata=NULL;
char *p;
int fnum = -1;
@@ -1861,9 +1861,10 @@
SIVAL(p,0,0); /* No oplock. */
SIVAL(p,4,wire_flags);
SIVAL(p,8,unix_perms_to_wire(mode));
- SSVAL(p,12,SMB_NO_INFO_LEVEL_RETURNED); /* No info level returned. */
+ SIVAL(p,12,0); /* Top bits of perms currently undefined. */
+ SSVAL(p,16,SMB_NO_INFO_LEVEL_RETURNED); /* No info level returned. */
- data_len = 14;
+ data_len = 18;
if (!cli_send_trans(cli, SMBtrans2,
NULL,/* name */
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2007-03-09 16:55:56 UTC (rev
21776)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2007-03-09 18:33:16 UTC (rev
21777)
@@ -5229,11 +5229,13 @@
uint16 info_level_return = 0;
char *pdata = *ppdata;
- if (total_data < 10) {
+ if (total_data < 18) {
return NT_STATUS_INVALID_PARAMETER;
}
raw_unixmode = IVAL(pdata,8);
+ /* Next 4 bytes are not yet defined. */
+
status = unix_perms_from_wire(conn, psbuf, raw_unixmode, PERM_NEW_DIR,
&unixmode);
if (!NT_STATUS_IS_OK(status)) {
return status;
@@ -5259,7 +5261,7 @@
close_file(fsp, NORMAL_CLOSE);
}
- info_level_return = SVAL(pdata,12);
+ info_level_return = SVAL(pdata,16);
if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
*pdata_return_size = 8 + SMB_FILE_UNIX_BASIC_SIZE;
@@ -5321,7 +5323,7 @@
int info = 0;
uint16 info_level_return = 0;
- if (total_data < 14) {
+ if (total_data < 18) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -5373,6 +5375,8 @@
}
raw_unixmode = IVAL(pdata,8);
+ /* Next 4 bytes are not yet defined. */
+
status = unix_perms_from_wire(conn,
psbuf,
raw_unixmode,
@@ -5424,7 +5428,7 @@
extended_oplock_granted = True;
}
- info_level_return = SVAL(pdata,12);
+ info_level_return = SVAL(pdata,16);
if (info_level_return == SMB_QUERY_FILE_UNIX_BASIC) {
*pdata_return_size = 8 + SMB_FILE_UNIX_BASIC_SIZE;
Modified: branches/SAMBA_3_0_25/source/include/trans2.h
===
--- branches/SAMBA_3_0_25/source/include/trans2.h 2007-03-09 16:55:56 UTC
(rev 21776)
+++ branches/SAMBA_3_0_25/source/include/trans2.h 2007-03-09 18:33:16 UTC
(rev 21777)
@@ -662,8 +662,8 @@
/* Definition of request data block for SMB_POSIX_PATH_OPEN */
/*
[4 bytes] flags (as smb_ntcreate_Flags).
- [4 bytes] open_mode
- [4 bytes] mode_t - same encoding as "Standard UNIX permissions"
above.
+ [4 bytes] open_mode - SMB_O_xxx flags above.
+ [8 bytes] mode_t (permissions
svn commit: samba r21776 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_25/source/utils
Author: idra
Date: 2007-03-09 16:55:56 + (Fri, 09 Mar 2007)
New Revision: 21776
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21776
Log:
fix bugs #4438 #4440
Modified:
branches/SAMBA_3_0/source/utils/net_sam.c
branches/SAMBA_3_0_25/source/utils/net_sam.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_sam.c
===
--- branches/SAMBA_3_0/source/utils/net_sam.c 2007-03-09 15:34:12 UTC (rev
21775)
+++ branches/SAMBA_3_0/source/utils/net_sam.c 2007-03-09 16:55:56 UTC (rev
21776)
@@ -1043,6 +1043,7 @@
d_fprintf(stderr, "Failed to add Domain Users group to
ldap directory\n");
}
} else {
+ domusers_gid = gmap.gid;
d_printf("found!\n");
}
@@ -1096,6 +1097,7 @@
d_fprintf(stderr, "Failed to add Domain Admins group to
ldap directory\n");
}
} else {
+ domadmins_gid = gmap.gid;
d_printf("found!\n");
}
@@ -1124,7 +1126,7 @@
d_printf("Adding the Administrator user.\n");
if (domadmins_gid == -1) {
- d_fprintf(stderr, "Can't create Administrtor user,
Domain Admins group not available!\n");
+ d_fprintf(stderr, "Can't create Administrator user,
Domain Admins group not available!\n");
goto done;
}
if (!winbind_allocate_uid(&uid)) {
@@ -1238,8 +1240,12 @@
smbldap_set_mod(&mods, LDAP_MOD_ADD, "displayName",
pwd->pw_name);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "uidNumber", uidstr);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "gidNumber", gidstr);
- smbldap_set_mod(&mods, LDAP_MOD_ADD, "homeDirectory",
pwd->pw_dir);
- smbldap_set_mod(&mods, LDAP_MOD_ADD, "loginShell",
pwd->pw_shell);
+ if ((pwd->pw_dir != NULL) && (pwd->pw_dir[0] != '\0')) {
+ smbldap_set_mod(&mods, LDAP_MOD_ADD, "homeDirectory",
pwd->pw_dir);
+ }
+ if ((pwd->pw_shell != NULL) && (pwd->pw_shell[0] != '\0')) {
+ smbldap_set_mod(&mods, LDAP_MOD_ADD, "loginShell",
pwd->pw_shell);
+ }
smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaSID",
sid_string_static(&sid));
smbldap_set_mod(&mods, LDAP_MOD_ADD, "sambaAcctFlags",
pdb_encode_acct_ctrl(ACB_NORMAL|ACB_DISABLED,
@@ -1261,7 +1267,7 @@
pwd = getpwnam_alloc(NULL, lp_guestaccount());
if (!pwd) {
d_fprintf(stderr, "Failed to find just created Guest account!\n"
- " Is nssswitch properly configured?!\n");
+ " Is nss properly configured?!\n");
goto failed;
}
Modified: branches/SAMBA_3_0_25/source/utils/net_sam.c
===
--- branches/SAMBA_3_0_25/source/utils/net_sam.c2007-03-09 15:34:12 UTC
(rev 21775)
+++ branches/SAMBA_3_0_25/source/utils/net_sam.c2007-03-09 16:55:56 UTC
(rev 21776)
@@ -1043,6 +1043,7 @@
d_fprintf(stderr, "Failed to add Domain Users group to
ldap directory\n");
}
} else {
+ domusers_gid = gmap.gid;
d_printf("found!\n");
}
@@ -1096,6 +1097,7 @@
d_fprintf(stderr, "Failed to add Domain Admins group to
ldap directory\n");
}
} else {
+ domadmins_gid = gmap.gid;
d_printf("found!\n");
}
@@ -1124,7 +1126,7 @@
d_printf("Adding the Administrator user.\n");
if (domadmins_gid == -1) {
- d_fprintf(stderr, "Can't create Administrtor user,
Domain Admins group not available!\n");
+ d_fprintf(stderr, "Can't create Administrator user,
Domain Admins group not available!\n");
goto done;
}
if (!winbind_allocate_uid(&uid)) {
@@ -1238,8 +1240,12 @@
smbldap_set_mod(&mods, LDAP_MOD_ADD, "displayName",
pwd->pw_name);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "uidNumber", uidstr);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "gidNumber", gidstr);
- smbldap_set_mod(&mods, LDAP_MOD_ADD, "homeDirectory",
pwd->pw_dir);
- smbldap_set_mod(&mods, LDAP_MOD_ADD, "loginShell",
pwd->pw_shell);
+ if ((pwd->pw_dir != NULL) && (pwd->pw_dir[0] != '\0')) {
+ smbldap_set_mod(&mods, LDAP_MOD_ADD, "homeDirectory",
pwd->pw_dir);
+ }
+ if ((pwd->pw_shell != NULL) && (pwd->pw_shell[0] != '\0')) {
+ smbldap_set_mod(&mods, LD
svn commit: samba r21775 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: herb
Date: 2007-03-09 15:34:12 + (Fri, 09 Mar 2007)
New Revision: 21775
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21775
Log:
make messages more understandable - don't leave part dangling after newline
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_user.c 2007-03-09 11:34:24 UTC
(rev 21774)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_user.c 2007-03-09 15:34:12 UTC
(rev 21775)
@@ -262,7 +262,7 @@
talloc_get_type_abort(private_data, struct getpwsid_state);
if (!success) {
- DEBUG(5, ("Could not query user's %s\\%s uid\n",
+ DEBUG(5, ("Could not query uid for user %s\\%s\n",
s->domain->name, s->username));
request_error(s->state);
return;
@@ -289,7 +289,7 @@
if ( s->gid == (gid_t)-1 ) {
if (!success) {
- DEBUG(5, ("Could not query user's %s\\%s\n gid",
+ DEBUG(5, ("Could not query gid for user %s\\%s\n",
s->domain->name, s->username));
goto failed;
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c 2007-03-09
11:34:24 UTC (rev 21774)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_user.c 2007-03-09
15:34:12 UTC (rev 21775)
@@ -262,7 +262,7 @@
talloc_get_type_abort(private_data, struct getpwsid_state);
if (!success) {
- DEBUG(5, ("Could not query user's %s\\%s uid\n",
+ DEBUG(5, ("Could not query uid for user %s\\%s\n",
s->domain->name, s->username));
request_error(s->state);
return;
@@ -289,7 +289,7 @@
if ( s->gid == (gid_t)-1 ) {
if (!success) {
- DEBUG(5, ("Could not query user's %s\\%s\n gid",
+ DEBUG(5, ("Could not query gid for user %s\\%s\n",
s->domain->name, s->username));
goto failed;
}
Re: svn commit: samba r21736 - in branches/SAMBA_4_0: source/auth/credentials source/lib/ldb/common testprogs/blackbox
On Wed, 2007-03-07 at 04:20 +, [EMAIL PROTECTED] wrote:
> Author: abartlet
> Date: 2007-03-07 04:20:10 + (Wed, 07 Mar 2007)
> New Revision: 21736
>
> WebSVN:
> http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21736
>
> Log:
> Fix the smbclient test to do something more interesting with the last
> few authentication tests. Now that the tests correctly 'fail', I was
> able to fix the credentials subsystem to honour USER and PASSWD.
>
> To get --machine-pass working, I needed ldb to always load it's static
> modules, so I put this in ldb_connect().
[..]
> Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
> ===
> --- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c2007-03-07 03:10:30 UTC
> (rev 21735)
> +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c2007-03-07 04:20:10 UTC
> (rev 21736)
> @@ -232,6 +232,9 @@
> {
> int ret;
>
> + /* We seem to need to do this here, or else some utilities don't get
> ldb backends */
> + ldb_global_init();
> +
> ldb->flags = flags;
>
> ret = ldb_connect_backend(ldb, url, options, &ldb->modules);
>
Andrew I think this is wrong, can you revert?
the init must be done in the client application, it is how it has been
architected, moving it into ldb.c is not the right thing to do.
Simo.
--
Simo Sorce
Samba Team GPL Compliance Officer
email: [EMAIL PROTECTED]
http://samba.org
svn commit: samba r21774 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd
Author: gd Date: 2007-03-09 11:34:24 + (Fri, 09 Mar 2007) New Revision: 21774 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21774 Log: Fix the build with Fedora Core 6. tridge/vl: please check. Guenther Modified: branches/SAMBA_3_0/source/smbd/notify_inotify.c branches/SAMBA_3_0_25/source/smbd/notify_inotify.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/notify_inotify.c === --- branches/SAMBA_3_0/source/smbd/notify_inotify.c 2007-03-09 10:09:37 UTC (rev 21773) +++ branches/SAMBA_3_0/source/smbd/notify_inotify.c 2007-03-09 11:34:24 UTC (rev 21774) @@ -26,6 +26,10 @@ #ifdef HAVE_INOTIFY +#ifdef HAVE_ASM_TYPES_H +#include +#endif + #include #include Modified: branches/SAMBA_3_0_25/source/smbd/notify_inotify.c === --- branches/SAMBA_3_0_25/source/smbd/notify_inotify.c 2007-03-09 10:09:37 UTC (rev 21773) +++ branches/SAMBA_3_0_25/source/smbd/notify_inotify.c 2007-03-09 11:34:24 UTC (rev 21774) @@ -26,6 +26,10 @@ #ifdef HAVE_INOTIFY +#ifdef HAVE_ASM_TYPES_H +#include +#endif + #include #include
svn commit: samba r21773 - in branches/SAMBA_4_0/source: dsdb/repl dsdb/samdb/ldb_modules librpc/idl
Author: metze
Date: 2007-03-09 10:09:37 + (Fri, 09 Mar 2007)
New Revision: 21773
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21773
Log:
fix typo orginating -> originating
and use the struct member names in all cases
metze
Modified:
branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c
===
--- branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c2007-03-09
07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/dsdb/repl/replicated_objects.c2007-03-09
10:09:37 UTC (rev 21773)
@@ -278,13 +278,13 @@
m->attid= a->attid;
m->version = d->version;
- m->orginating_time = d->orginating_time;
- m->orginating_invocation_id = d->orginating_invocation_id;
- m->orginating_usn = d->orginating_usn;
+ m->originating_change_time = d->originating_change_time;
+ m->originating_invocation_id= d->originating_invocation_id;
+ m->originating_usn = d->originating_usn;
m->local_usn= 0;
- if (d->orginating_time > whenChanged) {
- whenChanged = d->orginating_time;
+ if (d->originating_change_time > whenChanged) {
+ whenChanged = d->originating_change_time;
}
if (a->attid == DRSUAPI_ATTRIBUTE_name) {
@@ -302,9 +302,9 @@
rdn_m->attid= rdn_attid;
rdn_m->version = name_d->version;
- rdn_m->orginating_time =
name_d->orginating_time;
- rdn_m->orginating_invocation_id =
name_d->orginating_invocation_id;
- rdn_m->orginating_usn =
name_d->orginating_usn;
+ rdn_m->originating_change_time =
name_d->originating_change_time;
+ rdn_m->originating_invocation_id=
name_d->originating_invocation_id;
+ rdn_m->originating_usn =
name_d->originating_usn;
rdn_m->local_usn= 0;
md->ctr.ctr1.count++;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
2007-03-09 07:20:50 UTC (rev 21772)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/repl_meta_data.c
2007-03-09 10:09:37 UTC (rev 21773)
@@ -499,9 +499,9 @@
m->attid= sa->attributeID_id;
m->version = 1;
- m->orginating_time = now;
- m->orginating_invocation_id = *our_invocation_id;
- m->orginating_usn = seq_num;
+ m->originating_change_time = now;
+ m->originating_invocation_id= *our_invocation_id;
+ m->originating_usn = seq_num;
m->local_usn= seq_num;
ni++;
}
@@ -821,16 +821,16 @@
return m1->version - m2->version;
}
- if (m1->orginating_time != m2->orginating_time) {
- return m1->orginating_time - m2->orginating_time;
+ if (m1->originating_change_time != m2->originating_change_time) {
+ return m1->originating_change_time -
m2->originating_change_time;
}
- ret = GUID_compare(&m1->orginating_invocation_id,
&m2->orginating_invocation_id);
+ ret = GUID_compare(&m1->originating_invocation_id,
&m2->originating_invocation_id);
if (ret != 0) {
return ret;
}
- return m1->orginating_usn - m2->orginating_usn;
+ return m1->originating_usn - m2->originating_usn;
}
static int replmd_replicated_apply_merge_callback(struct ldb_context *ldb,
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-03-09 07:20:50 UTC
(rev 21772)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-03-09 10:09:37 UTC
(rev 21773)
@@ -21,9 +21,9 @@
typedef struct {
drsuapi_DsAttributeId attid;
uint32 version;
- NTTIME_1sec orginating_time;
- GUID orginating_invocation_id;
- hyper orginating_usn;
+ NTTIME_1
