svn commit: samba r10914 - in branches/SAMBA_4_0/source: dsdb/samdb ldap_server lib lib/ldb/common lib/ldb/include nbt_server/wins scripting/ejs
Author: tridge Date: 2005-10-12 06:30:47 + (Wed, 12 Oct 2005) New Revision: 10914 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10914 Log: moved the ldap time string functions into ldb so they can be used by the time attribute handling functions Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c branches/SAMBA_4_0/source/lib/ldb/include/ldb.h branches/SAMBA_4_0/source/lib/time.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c Changeset: Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c === --- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2005-10-12 06:10:23 UTC (rev 10913) +++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2005-10-12 06:30:47 UTC (rev 10914) @@ -909,19 +909,6 @@ } /* - set a ldaptime element in a message -*/ -int samdb_msg_set_ldaptime(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg, - const char *attr_name, time_t t) -{ - char *str = ldap_timestring(mem_ctx, t); - if (!str) { - return -1; - } - return samdb_msg_set_string(sam_ldb, mem_ctx, msg, attr_name, str); -} - -/* add a record */ int samdb_add(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg) Modified: branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c === --- branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c2005-10-12 06:10:23 UTC (rev 10913) +++ branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c2005-10-12 06:30:47 UTC (rev 10914) @@ -90,7 +90,7 @@ { int num_currentTime = 1; DATA_BLOB *currentTime = talloc_array(mem_ctx, DATA_BLOB, num_currentTime); - char *str = ldap_timestring(mem_ctx, time(NULL)); + char *str = ldb_timestring(mem_ctx, time(NULL)); NT_STATUS_HAVE_NO_MEMORY(str); currentTime[0].data = (uint8_t *)str; currentTime[0].length = strlen(str); @@ -316,7 +316,7 @@ for (j=0; j < ent->num_attributes; j++) { if (ent->attributes[j].num_values == 1 && ent->attributes[j].values[0].length >= 9 && - strncmp(ent->attributes[j].values[0].data, "_DYNAMIC_", 9) == 0) { + strncmp((char *)ent->attributes[j].values[0].data, "_DYNAMIC_", 9) == 0) { status = fill_dynamic_values(ent->attributes, &(ent->attributes[j])); if (!NT_STATUS_IS_OK(status)) { return status; Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c === --- branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2005-10-12 06:10:23 UTC (rev 10913) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2005-10-12 06:30:47 UTC (rev 10914) @@ -36,6 +36,7 @@ #include "ldb/include/ldb.h" #include "ldb/include/ldb_errors.h" #include "ldb/include/ldb_private.h" +#include /* create a new ldb_message in a given memory context (NULL for top level) @@ -594,3 +595,45 @@ return 0; } + +/* + return a LDAP formatted time string +*/ +char *ldb_timestring(TALLOC_CTX *mem_ctx, time_t t) +{ + struct tm *tm = gmtime(&t); + + if (!tm) { + return NULL; + } + + /* formatted like: 20040408072012.0Z */ + return talloc_asprintf(mem_ctx, + "%04u%02u%02u%02u%02u%02u.0Z", + tm->tm_year+1900, tm->tm_mon+1, + tm->tm_mday, tm->tm_hour, tm->tm_min, + tm->tm_sec); +} + + +/* + convert a LDAP time string to a time_t. Return 0 if unable to convert +*/ +time_t ldb_string_to_time(const char *s) +{ + struct tm tm; + + if (s == NULL) return 0; + + ZERO_STRUCT(tm); + if (sscanf(s, "%04u%02u%02u%02u%02u%02u.0Z", + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { + return 0; + } + tm.tm_year -= 1900; + tm.tm_mon -= 1; + + return timegm(&tm); +} + Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h === --- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2005-10-12 06:10:23 UTC (rev 10913) +++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2005-10-12 06:30:47 UTC (rev 10914) @@ -497,4 +497,7 @@ void ldb_msg_rename_attr(struct ldb_message *msg, const char *attr, const char *re
svn commit: samba r10913 - in branches/SAMBA_4_0/source: auth/gensec dsdb/samdb dsdb/samdb/ldb_modules include lib/ldb lib/ldb/common lib/ldb/include lib/ldb/ldb_tdb lib/ldb/modules lib/ldb/tools lib/
Author: tridge Date: 2005-10-12 06:10:23 + (Wed, 12 Oct 2005) New Revision: 10913 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10913 Log: This patch isn't as big as it looks ... most of the changes are fixes to make all the ldb code compile without warnings on gcc4. Unfortunately That required a lot of casts :-( I have also added the start of an 'operational' module, which will replace the timestamp module, plus add support for some other operational attributes In ldb_msg_*() I added some new utility functions to make the operational module sane, and remove the 'ldb' argument from the ldb_msg_add_*() functions. That argument was only needed back in the early days of ldb when we didn't use the hierarchical talloc and thus needed a place to get the allocation function from. Now its just a pain to pass around everywhere. Also added a ldb_debug_set() function that calls ldb_debug() plus sets the result using ldb_set_errstring(). That saves on some awkward coding in a few places. Added: branches/SAMBA_4_0/source/lib/ldb/modules/operational.c Modified: branches/SAMBA_4_0/source/auth/gensec/schannel_state.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/include/ioctl.h branches/SAMBA_4_0/source/lib/ldb/common/attrib_handlers.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_debug.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_utf8.c branches/SAMBA_4_0/source/lib/ldb/config.mk branches/SAMBA_4_0/source/lib/ldb/include/ldb.h branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_cache.c branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_pack.c branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c branches/SAMBA_4_0/source/lib/ldb/modules/schema.c branches/SAMBA_4_0/source/lib/ldb/modules/timestamps.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c branches/SAMBA_4_0/source/lib/ldb/tools/oLschema2ldif.c branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c branches/SAMBA_4_0/source/libcli/ldap/ldap.c branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/web_server/web_server.c Changeset: Sorry, the patch is too large (2323 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10913
svn commit: samba r10912 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge Date: 2005-10-12 06:03:28 + (Wed, 12 Oct 2005) New Revision: 10912 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10912 Log: added a test for supporting batch oplock upgrades Modified: branches/SAMBA_4_0/source/torture/raw/ioctl.c Changeset: Modified: branches/SAMBA_4_0/source/torture/raw/ioctl.c === --- branches/SAMBA_4_0/source/torture/raw/ioctl.c 2005-10-11 20:14:04 UTC (rev 10911) +++ branches/SAMBA_4_0/source/torture/raw/ioctl.c 2005-10-12 06:03:28 UTC (rev 10912) @@ -105,6 +105,20 @@ status = smb_raw_ioctl(cli->tree, mem_ctx, &nt); CHECK_STATUS(status, NT_STATUS_OK); + printf("trying batch oplock\n"); + nt.ioctl.level = RAW_IOCTL_NTIOCTL; + nt.ntioctl.in.function = (FSCTL_FILESYSTEM | (2<<2)); + nt.ntioctl.in.fnum = fnum; + nt.ntioctl.in.fsctl = True; + nt.ntioctl.in.filter = 0; + + status = smb_raw_ioctl(cli->tree, mem_ctx, &nt); + if (NT_STATUS_IS_OK(status)) { + printf("Server supports batch oplock upgrades on open files\n"); + } else { + printf("Server does not support batch oplock upgrades on open files\n"); + } + printf("Trying bad handle\n"); nt.ntioctl.in.fnum = fnum+1; status = smb_raw_ioctl(cli->tree, mem_ctx, &nt);
Build status as of Wed Oct 12 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-10-11 00:00:33.0 + +++ /home/build/master/cache/broken_results.txt 2005-10-12 00:00:11.0 + @@ -1,17 +1,17 @@ -Build status as of Tue Oct 11 00:00:02 2005 +Build status as of Wed Oct 12 00:00:02 2005 Build counts: Tree Total Broken Panic ccache 10 2 0 distcc 11 3 0 -lorikeet-heimdal 12 6 0 -ppp 18 0 0 -rsync37 2 0 +lorikeet-heimdal 12 8 0 +ppp 17 0 0 +rsync33 2 0 samba2 0 0 samba-docs 0 0 0 -samba4 38 16 4 -samba_3_038 10 0 -smb-build29 5 0 -talloc 11 5 0 -tdb 9 4 0 +samba4 37 15 4 +samba_3_037 9 0 +smb-build28 5 0 +talloc 10 5 0 +tdb 34 4 0
svn commit: samba r10911 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/param branches/SAMBA_3_0/source/passdb branches/SAMBA_3_0/source/rpc_server trunk/source/include trunk/source/par
Author: jmcd Date: 2005-10-11 20:14:04 + (Tue, 11 Oct 2005) New Revision: 10911 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10911 Log: part of #2861: add rename support for usrmgr.exe when using tdbsam This gets it working before replacing tdb with the samba4 version. Modified: branches/SAMBA_3_0/source/include/passdb.h branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0/source/passdb/pdb_interface.c branches/SAMBA_3_0/source/passdb/pdb_tdb.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c trunk/source/include/passdb.h trunk/source/param/loadparm.c trunk/source/passdb/pdb_interface.c trunk/source/passdb/pdb_tdb.c trunk/source/rpc_server/srv_samr_nt.c Changeset: Sorry, the patch is too large (1081 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10911
svn commit: samba r10910 - in trunk/source: include libsmb utils
Author: jmcd Date: 2005-10-11 18:53:13 + (Tue, 11 Oct 2005) New Revision: 10910 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10910 Log: Give better shutdown messages Modified: trunk/source/include/doserr.h trunk/source/libsmb/doserr.c trunk/source/utils/net_rpc.c Changeset: Modified: trunk/source/include/doserr.h === --- trunk/source/include/doserr.h 2005-10-11 18:42:25 UTC (rev 10909) +++ trunk/source/include/doserr.h 2005-10-11 18:53:13 UTC (rev 10910) @@ -196,6 +196,7 @@ #define WERR_REG_FILE_INVALID W_ERROR(1017) #define WERR_NO_SUCH_SERVICE W_ERROR(1060) #define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052) +#define WERR_MACHINE_LOCKED W_ERROR(1271) #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338) #define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(1500) #define WERR_SERVER_UNAVAILABLE W_ERROR(1722) Modified: trunk/source/libsmb/doserr.c === --- trunk/source/libsmb/doserr.c2005-10-11 18:42:25 UTC (rev 10909) +++ trunk/source/libsmb/doserr.c2005-10-11 18:53:13 UTC (rev 10910) @@ -66,6 +66,7 @@ { "WERR_DFS_NO_SUCH_SERVER", WERR_DFS_NO_SUCH_SERVER }, { "WERR_DFS_INTERNAL_ERROR", WERR_DFS_INTERNAL_ERROR }, { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT }, + { "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED }, { "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR }, { "WERR_INVALID_OWNER", WERR_INVALID_OWNER }, { "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE }, Modified: trunk/source/utils/net_rpc.c === --- trunk/source/utils/net_rpc.c2005-10-11 18:42:25 UTC (rev 10909) +++ trunk/source/utils/net_rpc.c2005-10-11 18:53:13 UTC (rev 10910) @@ -4610,9 +4610,9 @@ if (NT_STATUS_IS_OK(result)) { d_printf("\nShutdown of remote machine succeeded\n"); DEBUG(5,("Shutdown of remote machine succeeded\n")); - } else - DEBUG(0,("Shutdown of remote machine failed!\n")); - + } else { + DEBUG(1,("Shutdown of remote machine failed!\n")); + } return result; } @@ -4640,7 +4640,7 @@ int argc, const char **argv) { - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; + WERROR result; const char *msg = "This machine will be shutdown shortly"; uint32 timeout = 20; #if 0 @@ -4676,16 +4676,19 @@ } /* create an entry */ - result = werror_to_ntstatus(rpccli_reg_shutdown(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, opt_force)); + result = rpccli_reg_shutdown(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, opt_force); - if (NT_STATUS_IS_OK(result)) { + if (W_ERROR_IS_OK(result)) { d_printf("\nShutdown of remote machine succeeded\n"); - DEBUG(5,("Shutdown of remote machine succeeded\n")); + } else { + d_printf("\nShutdown of remote machine failed\n"); + if (W_ERROR_EQUAL(result,WERR_MACHINE_LOCKED)) + d_printf("\nMachine locked, use -f switch to force\n"); + else + d_printf("\nresult was: %s\n", dos_errstr(result)); } - else - DEBUG(0,("Shutdown of remote machine failed!\n")); - return result; + return werror_to_ntstatus(result); } /** @@ -4703,13 +4706,14 @@ int rc = run_rpc_command(NULL, PI_SHUTDOWN, 0, rpc_init_shutdown_internals, argc, argv); - if (rc == 0) - return rc; - DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n")); + if (rc) { + DEBUG(1, ("initshutdown pipe failed, trying winreg pipe\n")); + rc = run_rpc_command(NULL, PI_WINREG, 0, +rpc_reg_shutdown_internals, argc, argv); + } - return run_rpc_command(NULL, PI_WINREG, 0, rpc_reg_shutdown_internals, - argc, argv); + return rc; } /***
svn commit: samba r10909 - in branches/SAMBA_3_0/source: include libsmb utils
Author: jmcd Date: 2005-10-11 18:42:25 + (Tue, 11 Oct 2005) New Revision: 10909 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10909 Log: Give better shutdown messages Modified: branches/SAMBA_3_0/source/include/doserr.h branches/SAMBA_3_0/source/libsmb/doserr.c branches/SAMBA_3_0/source/utils/net_rpc.c Changeset: Modified: branches/SAMBA_3_0/source/include/doserr.h === --- branches/SAMBA_3_0/source/include/doserr.h 2005-10-11 17:36:29 UTC (rev 10908) +++ branches/SAMBA_3_0/source/include/doserr.h 2005-10-11 18:42:25 UTC (rev 10909) @@ -196,6 +196,7 @@ #define WERR_REG_FILE_INVALID W_ERROR(1017) #define WERR_NO_SUCH_SERVICE W_ERROR(1060) #define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052) +#define WERR_MACHINE_LOCKED W_ERROR(1271) #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338) #define WERR_SERVER_UNAVAILABLE W_ERROR(1722) #define WERR_INVALID_FORM_NAME W_ERROR(1902) Modified: branches/SAMBA_3_0/source/libsmb/doserr.c === --- branches/SAMBA_3_0/source/libsmb/doserr.c 2005-10-11 17:36:29 UTC (rev 10908) +++ branches/SAMBA_3_0/source/libsmb/doserr.c 2005-10-11 18:42:25 UTC (rev 10909) @@ -66,6 +66,7 @@ { "WERR_DFS_NO_SUCH_SERVER", WERR_DFS_NO_SUCH_SERVER }, { "WERR_DFS_INTERNAL_ERROR", WERR_DFS_INTERNAL_ERROR }, { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT }, + { "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED }, { "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR }, { "WERR_INVALID_OWNER", WERR_INVALID_OWNER }, { "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE }, Modified: branches/SAMBA_3_0/source/utils/net_rpc.c === --- branches/SAMBA_3_0/source/utils/net_rpc.c 2005-10-11 17:36:29 UTC (rev 10908) +++ branches/SAMBA_3_0/source/utils/net_rpc.c 2005-10-11 18:42:25 UTC (rev 10909) @@ -4610,9 +4610,9 @@ if (NT_STATUS_IS_OK(result)) { d_printf("\nShutdown of remote machine succeeded\n"); DEBUG(5,("Shutdown of remote machine succeeded\n")); - } else - DEBUG(0,("Shutdown of remote machine failed!\n")); - + } else { + DEBUG(1,("Shutdown of remote machine failed!\n")); + } return result; } @@ -4640,7 +4640,7 @@ int argc, const char **argv) { - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; + WERROR result; const char *msg = "This machine will be shutdown shortly"; uint32 timeout = 20; #if 0 @@ -4676,16 +4676,19 @@ } /* create an entry */ - result = werror_to_ntstatus(rpccli_reg_shutdown(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, opt_force)); + result = rpccli_reg_shutdown(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, opt_force); - if (NT_STATUS_IS_OK(result)) { + if (W_ERROR_IS_OK(result)) { d_printf("\nShutdown of remote machine succeeded\n"); - DEBUG(5,("Shutdown of remote machine succeeded\n")); + } else { + d_printf("\nShutdown of remote machine failed\n"); + if (W_ERROR_EQUAL(result,WERR_MACHINE_LOCKED)) + d_printf("\nMachine locked, use -f switch to force\n"); + else + d_printf("\nresult was: %s\n", dos_errstr(result)); } - else - DEBUG(0,("Shutdown of remote machine failed!\n")); - return result; + return werror_to_ntstatus(result); } /** @@ -4703,13 +4706,14 @@ int rc = run_rpc_command(NULL, PI_SHUTDOWN, 0, rpc_init_shutdown_internals, argc, argv); - if (rc == 0) - return rc; - DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n")); + if (rc) { + DEBUG(1, ("initshutdown pipe failed, trying winreg pipe\n")); + rc = run_rpc_command(NULL, PI_WINREG, 0, +rpc_reg_shutdown_internals, argc, argv); + } - return run_rpc_command(NULL, PI_WINREG, 0, rpc_reg_shutdown_internals, - argc, argv); + return rc; } /***
svn commit: samba r10908 - branches/SAMBA_3_0/source/rpc_client trunk/source/rpc_client
Author: gd Date: 2005-10-11 17:36:29 + (Tue, 11 Oct 2005) New Revision: 10908 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10908 Log: Fix PIPE mismatch to make wbinfo -m work again Guenther Modified: branches/SAMBA_3_0/source/rpc_client/cli_ds.c trunk/source/rpc_client/cli_ds.c Changeset: Modified: branches/SAMBA_3_0/source/rpc_client/cli_ds.c === --- branches/SAMBA_3_0/source/rpc_client/cli_ds.c 2005-10-11 16:27:05 UTC (rev 10907) +++ branches/SAMBA_3_0/source/rpc_client/cli_ds.c 2005-10-11 17:36:29 UTC (rev 10908) @@ -85,7 +85,7 @@ init_q_ds_enum_domain_trusts( &q, server, flags ); - CLI_DO_RPC( cli, mem_ctx, PI_LSARPC_DS, DS_ENUM_DOM_TRUSTS, + CLI_DO_RPC( cli, mem_ctx, PI_NETLOGON, DS_ENUM_DOM_TRUSTS, q, r, qbuf, rbuf, ds_io_q_enum_domain_trusts, Modified: trunk/source/rpc_client/cli_ds.c === --- trunk/source/rpc_client/cli_ds.c2005-10-11 16:27:05 UTC (rev 10907) +++ trunk/source/rpc_client/cli_ds.c2005-10-11 17:36:29 UTC (rev 10908) @@ -85,7 +85,7 @@ init_q_ds_enum_domain_trusts( &q, server, flags ); - CLI_DO_RPC( cli, mem_ctx, PI_LSARPC_DS, DS_ENUM_DOM_TRUSTS, + CLI_DO_RPC( cli, mem_ctx, PI_NETLOGON, DS_ENUM_DOM_TRUSTS, q, r, qbuf, rbuf, ds_io_q_enum_domain_trusts,
svn commit: samba r10907 - branches/SAMBA_3_0/source/libads branches/SAMBA_3_0/source/libsmb trunk/source/libads trunk/source/libsmb
Author: gd Date: 2005-10-11 16:27:05 + (Tue, 11 Oct 2005) New Revision: 10907 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10907 Log: Handle the case when we can't verify the PAC signature because the ticket was encrypted using a DES key (and the Windows KDC still puts CKSUMTYPE_HMAC_MD5_ARCFOUR in the PAC). In that case, return to old behaviour and ignore the PAC. Thanks to Chengjie Liu <[EMAIL PROTECTED]>. Guenther Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c branches/SAMBA_3_0/source/libsmb/clikrb5.c trunk/source/libads/kerberos_verify.c trunk/source/libsmb/clikrb5.c Changeset: Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c === --- branches/SAMBA_3_0/source/libads/kerberos_verify.c 2005-10-11 16:14:00 UTC (rev 10906) +++ branches/SAMBA_3_0/source/libads/kerberos_verify.c 2005-10-11 16:27:05 UTC (rev 10907) @@ -272,6 +272,7 @@ DATA_BLOB *session_key) { NTSTATUS sret = NT_STATUS_LOGON_FAILURE; + NTSTATUS pac_ret; DATA_BLOB auth_data; krb5_context context = NULL; krb5_auth_context auth_context = NULL; @@ -400,7 +401,8 @@ #endif /* continue when no PAC is retrieved - (like accounts that have the UF_NO_AUTH_DATA_REQUIRED flag set) */ + (like accounts that have the UF_NO_AUTH_DATA_REQUIRED flag set, + or Kerberos tickets encryped using a DES key) - Guenther */ got_auth_data = get_auth_data_from_tkt(mem_ctx, &auth_data, tkt); if (!got_auth_data) { @@ -409,10 +411,10 @@ if (got_auth_data && pac_data != NULL) { - sret = decode_pac_data(mem_ctx, &auth_data, context, keyblock, client_principal, authtime, pac_data); - if (!NT_STATUS_IS_OK(sret)) { - DEBUG(0,("ads_verify_ticket: failed to decode PAC_DATA: %s\n", nt_errstr(sret))); - goto out; + pac_ret = decode_pac_data(mem_ctx, &auth_data, context, keyblock, client_principal, authtime, pac_data); + if (!NT_STATUS_IS_OK(pac_ret)) { + DEBUG(3,("ads_verify_ticket: failed to decode PAC_DATA: %s\n", nt_errstr(pac_ret))); + *pac_data = NULL; } data_blob_free(&auth_data); } Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c === --- branches/SAMBA_3_0/source/libsmb/clikrb5.c 2005-10-11 16:14:00 UTC (rev 10906) +++ branches/SAMBA_3_0/source/libsmb/clikrb5.c 2005-10-11 16:27:05 UTC (rev 10907) @@ -689,6 +689,12 @@ &input, cksum, &checksum_valid); + if (ret) { + DEBUG(3,("smb_krb5_verify_checksum: krb5_c_verify_checksum() failed: %s\n", + error_message(ret))); + return ret; + } + if (!checksum_valid) ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; } Modified: trunk/source/libads/kerberos_verify.c === --- trunk/source/libads/kerberos_verify.c 2005-10-11 16:14:00 UTC (rev 10906) +++ trunk/source/libads/kerberos_verify.c 2005-10-11 16:27:05 UTC (rev 10907) @@ -272,6 +272,7 @@ DATA_BLOB *session_key) { NTSTATUS sret = NT_STATUS_LOGON_FAILURE; + NTSTATUS pac_ret; DATA_BLOB auth_data; krb5_context context = NULL; krb5_auth_context auth_context = NULL; @@ -400,7 +401,8 @@ #endif /* continue when no PAC is retrieved - (like accounts that have the UF_NO_AUTH_DATA_REQUIRED flag set) */ + (like accounts that have the UF_NO_AUTH_DATA_REQUIRED flag set, + or Kerberos tickets encryped using a DES key) - Guenther */ got_auth_data = get_auth_data_from_tkt(mem_ctx, &auth_data, tkt); if (!got_auth_data) { @@ -409,10 +411,10 @@ if (got_auth_data && pac_data != NULL) { - sret = decode_pac_data(mem_ctx, &auth_data, context, keyblock, client_principal, authtime, pac_data); - if (!NT_STATUS_IS_OK(sret)) { - DEBUG(0,("ads_verify_ticket: failed to decode PAC_DATA: %s\n", nt_errstr(sret))); - goto out; + pac_ret = decode_pac_data(mem_ctx, &auth_data, context, keyblock, client_principal, authtime, pac_data); + if (!NT_STATUS_IS_OK(pac_ret)) { + DEBUG(3,("ads_verify_ticket: failed to decode PAC_DATA: %s\n", nt_errstr(pac_ret))); + *pac_data = NULL; } data_blob_free(&auth_data); } Modified: trunk/s
svn commit: samba r10906 - in branches/tmp/SAMBA_3_0_20B: .
Author: jerry Date: 2005-10-11 16:14:00 + (Tue, 11 Oct 2005) New Revision: 10906 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10906 Log: updating release notes Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt Changeset: Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt === --- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 16:12:48 UTC (rev 10905) +++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 16:14:00 UTC (rev 10906) @@ -33,6 +33,10 @@ which cannot be read due to permissions. +o Marc Balmer <[EMAIL PROTECTED]> +* Build fixes when builddir != srcdir + + o Alex Deiter <[EMAIL PROTECTED]> * BUG 3145: Fix build issue regarding quota support on Solaris.
svn commit: samba r10905 - in branches/tmp/SAMBA_3_0_20B/source: . script
Author: jerry Date: 2005-10-11 16:12:48 + (Tue, 11 Oct 2005) New Revision: 10905 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10905 Log: build patches from Marc Balmer <[EMAIL PROTECTED]> when builddir!=srcdir Modified: branches/tmp/SAMBA_3_0_20B/source/Makefile.in branches/tmp/SAMBA_3_0_20B/source/script/installman.sh Changeset: Modified: branches/tmp/SAMBA_3_0_20B/source/Makefile.in === --- branches/tmp/SAMBA_3_0_20B/source/Makefile.in 2005-10-11 16:12:40 UTC (rev 10904) +++ branches/tmp/SAMBA_3_0_20B/source/Makefile.in 2005-10-11 16:12:48 UTC (rev 10905) @@ -785,24 +785,24 @@ dynconfig.o: dynconfig.c Makefile @echo Compiling $*.c - @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c dynconfig.c -o $@ + @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/dynconfig.c -o $@ [EMAIL PROTECTED]@: dynconfig.c Makefile @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c dynconfig.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/dynconfig.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ lib/version.o: lib/version.c include/version.h @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/lib/version.c -o $@ lib/[EMAIL PROTECTED]@: lib/version.c include/version.h @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/lib/version.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h Modified: branches/tmp/SAMBA_3_0_20B/source/script/installman.sh === --- branches/tmp/SAMBA_3_0_20B/source/script/installman.sh 2005-10-11 16:12:40 UTC (rev 10904) +++ branches/tmp/SAMBA_3_0_20B/source/script/installman.sh 2005-10-11 16:12:48 UTC (rev 10905) @@ -13,7 +13,7 @@ GROFF=$4# sh cmd line, including options fi -if test ! -d ../docs/manpages; then +if test ! -d $SRCDIR../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi
svn commit: samba r10904 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/script trunk/source trunk/source/script
Author: jerry Date: 2005-10-11 16:12:40 + (Tue, 11 Oct 2005) New Revision: 10904 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10904 Log: build patches from Marc Balmer <[EMAIL PROTECTED]> when builddir!=srcdir Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/script/installman.sh trunk/source/Makefile.in trunk/source/script/installman.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2005-10-11 15:21:00 UTC (rev 10903) +++ branches/SAMBA_3_0/source/Makefile.in 2005-10-11 16:12:40 UTC (rev 10904) @@ -811,24 +811,24 @@ dynconfig.o: dynconfig.c Makefile @echo Compiling $*.c - @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c dynconfig.c -o $@ + @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/dynconfig.c -o $@ [EMAIL PROTECTED]@: dynconfig.c Makefile @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c dynconfig.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/dynconfig.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ lib/version.o: lib/version.c include/version.h @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/lib/version.c -o $@ lib/[EMAIL PROTECTED]@: lib/version.c include/version.h @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/lib/version.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h Modified: branches/SAMBA_3_0/source/script/installman.sh === --- branches/SAMBA_3_0/source/script/installman.sh 2005-10-11 15:21:00 UTC (rev 10903) +++ branches/SAMBA_3_0/source/script/installman.sh 2005-10-11 16:12:40 UTC (rev 10904) @@ -13,7 +13,7 @@ GROFF=$4# sh cmd line, including options fi -if test ! -d ../docs/manpages; then +if test ! -d $SRCDIR../docs/manpages; then echo "No manpages present. SVN development version maybe?" exit 0 fi Modified: trunk/source/Makefile.in === --- trunk/source/Makefile.in2005-10-11 15:21:00 UTC (rev 10903) +++ trunk/source/Makefile.in2005-10-11 16:12:40 UTC (rev 10904) @@ -820,24 +820,24 @@ dynconfig.o: dynconfig.c Makefile @echo Compiling $*.c - @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c dynconfig.c -o $@ + @$(CC) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/dynconfig.c -o $@ [EMAIL PROTECTED]@: dynconfig.c Makefile @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c dynconfig.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/dynconfig.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ lib/version.o: lib/version.c include/version.h @echo Compiling $*.c - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PIE_CFLAGS@ -c $(srcdir)/lib/version.c -o $@ lib/[EMAIL PROTECTED]@: lib/version.c include/version.h @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi @echo Compiling $*.c with @PICFLAGS@ - @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c lib/version.c -o $@ + @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $(srcdir)/lib/version.c -o $@ @BROKEN_CC@-mv `echo $@ | sed -e 's%^.*/%%g' -e '[EMAIL PROTECTED]@$$%.o%'` $@ smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h Modified: trunk/source/script/installman.sh === --- trunk/source/script/installman.sh 2005-10-11 15:21:00 UTC (rev 10903) +++
svn commit: samba r10903 - in branches/tmp/samba4-winsrepl: . source/auth/gensec source/dsdb source/dsdb/samdb source/dsdb/samdb/ldb_modules source/lib source/lib/ldb/common source/lib/ldb/ldb_tdb sou
Author: metze Date: 2005-10-11 15:21:00 + (Tue, 11 Oct 2005) New Revision: 10903 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10903 Log: [EMAIL PROTECTED] (orig r10891): tridge | 2005-10-11 07:01:52 +0200 I noticed that the secrets.db was not being backed up on my system due to msync/mmap not changing the mtime of the file. This patch ensures that for successfully completed transactions we update the mtime. I don't do this on all tdb writes as its too expensive, but doing it just on transactions is bearable, as those cost quite a lot anyway. [EMAIL PROTECTED] (orig r10892): tridge | 2005-10-11 08:21:07 +0200 - improved the handling of the special distinguishedName attribute - ensure we don't add attributes twice, should a user ask for the attribute twice. Do this in such a way that we don't become O(n^2) - removed some unused code [EMAIL PROTECTED] (orig r10893): tridge | 2005-10-11 12:53:28 +0200 add configure test for utime (needed for the previous utime patch) [EMAIL PROTECTED] (orig r10894): tridge | 2005-10-11 13:00:16 +0200 make the handling of dn/distinguishedName much closer to real ldap. Also ensure we put a objectclass on our private ldb's, so they have some chance of being stored in ldap if you want to [EMAIL PROTECTED] (orig r10895): tridge | 2005-10-11 14:25:55 +0200 allow 'dn=string' searches to work again. Windows doesn't allow these, but they are so very useful for things like [EMAIL PROTECTED] that I think its worth supporting them [EMAIL PROTECTED] (orig r10896): tridge | 2005-10-11 14:30:34 +0200 added a strcasestr() replacement function [EMAIL PROTECTED] (orig r10897): tridge | 2005-10-11 14:31:31 +0200 added in a hackish ldb proxy module that I am using to experiment with mmc management support Added: branches/tmp/samba4-winsrepl/source/dsdb/samdb/ldb_modules/proxy.c Modified: branches/tmp/samba4-winsrepl/ branches/tmp/samba4-winsrepl/source/auth/gensec/schannel_state.c branches/tmp/samba4-winsrepl/source/dsdb/config.mk branches/tmp/samba4-winsrepl/source/dsdb/samdb/samdb.c branches/tmp/samba4-winsrepl/source/lib/gendb.c branches/tmp/samba4-winsrepl/source/lib/ldb/common/ldb_match.c branches/tmp/samba4-winsrepl/source/lib/ldb/common/ldb_modules.c branches/tmp/samba4-winsrepl/source/lib/ldb/common/ldb_parse.c branches/tmp/samba4-winsrepl/source/lib/ldb/ldb_tdb/ldb_search.c branches/tmp/samba4-winsrepl/source/lib/ldb/tools/cmdline.c branches/tmp/samba4-winsrepl/source/lib/ldb/tools/ldbdel.c branches/tmp/samba4-winsrepl/source/lib/ldb/tools/ldbedit.c branches/tmp/samba4-winsrepl/source/lib/ldb/tools/ldbsearch.c branches/tmp/samba4-winsrepl/source/lib/replace/config.m4 branches/tmp/samba4-winsrepl/source/lib/replace/replace.c branches/tmp/samba4-winsrepl/source/lib/replace/replace.h branches/tmp/samba4-winsrepl/source/lib/tdb/common/transaction.c branches/tmp/samba4-winsrepl/source/lib/tdb/config.m4 branches/tmp/samba4-winsrepl/source/libnet/libnet_samsync_ldb.c branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c branches/tmp/samba4-winsrepl/source/rpc_server/drsuapi/drsuapi_cracknames.c branches/tmp/samba4-winsrepl/source/rpc_server/lsa/dcesrv_lsa.c branches/tmp/samba4-winsrepl/source/rpc_server/samr/dcesrv_samr.c Changeset: Sorry, the patch is too large (1053 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10903
svn commit: samba r10902 - in branches/tmp/SAMBA_3_0_20B: . source/smbd
Author: jerry Date: 2005-10-11 14:56:44 + (Tue, 11 Oct 2005) New Revision: 10902 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10902 Log: adding quota fix from Alex Deiter Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c Changeset: Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt === --- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:46:40 UTC (rev 10901) +++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:56:44 UTC (rev 10902) @@ -33,6 +33,10 @@ which cannot be read due to permissions. +o Alex Deiter <[EMAIL PROTECTED]> +* BUG 3145: Fix build issue regarding quota support on Solaris. + + o Volker Lendecke <[EMAIL PROTECTED]> * BUG 3068: Fix for winbindd crashed by empty DC alternative name. Modified: branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c === --- branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c 2005-10-11 14:46:40 UTC (rev 10901) +++ branches/tmp/SAMBA_3_0_20B/source/smbd/quotas.c 2005-10-11 14:56:44 UTC (rev 10902) @@ -414,7 +414,7 @@ static int quotastat; -static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) +static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) { if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN )) return(0); @@ -423,7 +423,7 @@ return (1); } -static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) +static int my_xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) { if (!xdr_int(xdrsp, "astat)) { DEBUG(6,("nfs_quotas: Status bad or zero\n")); @@ -493,7 +493,7 @@ clnt->cl_auth = authunix_create_default(); DEBUG(9,("nfs_quotas: auth_success\n")); - clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, xdr_getquota_args, (caddr_t)&args, xdr_getquota_rslt, (caddr_t)&gqr, timeout); + clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, my_xdr_getquota_args, (caddr_t)&args, my_xdr_getquota_rslt, (caddr_t)&gqr, timeout); if (clnt_stat != RPC_SUCCESS) { DEBUG(9,("nfs_quotas: clnt_call fail\n"));
svn commit: samba r10901 - branches/SAMBA_3_0/source/smbd trunk/source/smbd
Author: jerry Date: 2005-10-11 14:46:40 + (Tue, 11 Oct 2005) New Revision: 10901 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10901 Log: BUG 3145: Fix build issue regarding quota support on Solaris Modified: branches/SAMBA_3_0/source/smbd/quotas.c trunk/source/smbd/quotas.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/quotas.c === --- branches/SAMBA_3_0/source/smbd/quotas.c 2005-10-11 14:38:04 UTC (rev 10900) +++ branches/SAMBA_3_0/source/smbd/quotas.c 2005-10-11 14:46:40 UTC (rev 10901) @@ -414,7 +414,7 @@ static int quotastat; -static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) +static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) { if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN )) return(0); @@ -423,7 +423,7 @@ return (1); } -static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) +static int my_xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) { if (!xdr_int(xdrsp, "astat)) { DEBUG(6,("nfs_quotas: Status bad or zero\n")); @@ -493,7 +493,7 @@ clnt->cl_auth = authunix_create_default(); DEBUG(9,("nfs_quotas: auth_success\n")); - clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, xdr_getquota_args, (caddr_t)&args, xdr_getquota_rslt, (caddr_t)&gqr, timeout); + clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, my_xdr_getquota_args, (caddr_t)&args, my_xdr_getquota_rslt, (caddr_t)&gqr, timeout); if (clnt_stat != RPC_SUCCESS) { DEBUG(9,("nfs_quotas: clnt_call fail\n")); Modified: trunk/source/smbd/quotas.c === --- trunk/source/smbd/quotas.c 2005-10-11 14:38:04 UTC (rev 10900) +++ trunk/source/smbd/quotas.c 2005-10-11 14:46:40 UTC (rev 10901) @@ -414,7 +414,7 @@ static int quotastat; -static int xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) +static int my_xdr_getquota_args(XDR *xdrsp, struct getquota_args *args) { if (!xdr_string(xdrsp, &args->gqa_pathp, RQ_PATHLEN )) return(0); @@ -423,7 +423,7 @@ return (1); } -static int xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) +static int my_xdr_getquota_rslt(XDR *xdrsp, struct getquota_rslt *gqr) { if (!xdr_int(xdrsp, "astat)) { DEBUG(6,("nfs_quotas: Status bad or zero\n")); @@ -493,7 +493,7 @@ clnt->cl_auth = authunix_create_default(); DEBUG(9,("nfs_quotas: auth_success\n")); - clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, xdr_getquota_args, (caddr_t)&args, xdr_getquota_rslt, (caddr_t)&gqr, timeout); + clnt_stat=clnt_call(clnt, RQUOTAPROC_GETQUOTA, my_xdr_getquota_args, (caddr_t)&args, my_xdr_getquota_rslt, (caddr_t)&gqr, timeout); if (clnt_stat != RPC_SUCCESS) { DEBUG(9,("nfs_quotas: clnt_call fail\n"));
svn commit: samba r10900 - in branches/tmp/SAMBA_3_0_20B: .
Author: jerry Date: 2005-10-11 14:38:04 + (Tue, 11 Oct 2005) New Revision: 10900 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10900 Log: updating relnotes with commit log Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt Changeset: Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt === --- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:19:06 UTC (rev 10899) +++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:38:04 UTC (rev 10900) @@ -10,7 +10,10 @@ Common bugs fixed in 3.0.20b include: - o + o A crash bug in winbindd + o Reporting files as read-only instead of returning the +correct error code of "access denied" + @@ -26,8 +29,13 @@ --- o Jeremy Allison <[EMAIL PROTECTED]> -o Gerald (Jerry) Carter <[EMAIL PROTECTED]> +* BUG 3088: Fix error condition for files on a read-write share + which cannot be read due to permissions. + + o Volker Lendecke <[EMAIL PROTECTED]> +* BUG 3068: Fix for winbindd crashed by empty DC alternative + name. Release Notes for older release follow:
svn commit: samba r10899 - in branches/tmp/SAMBA_3_0_20B: . source source/include source/nmbd source/nsswitch source/smbd source/wrepld
Author: jerry Date: 2005-10-11 14:19:06 + (Tue, 11 Oct 2005) New Revision: 10899 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10899 Log: merges for 3.0.20b svn merge -r10819:10888 $SVNURL/branches/SAMBA_3_0 svn merge -r10730:10744 $SVNURL/branches/SAMBA_3_0 svn merge -r10676:10688 $SVNURL/branches/SAMBA_3_0 Start updating the WHATSNEW and setting the version Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt branches/tmp/SAMBA_3_0_20B/source/VERSION branches/tmp/SAMBA_3_0_20B/source/include/smb.h branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c branches/tmp/SAMBA_3_0_20B/source/smbd/open.c branches/tmp/SAMBA_3_0_20B/source/smbd/posix_acls.c branches/tmp/SAMBA_3_0_20B/source/smbd/server.c branches/tmp/SAMBA_3_0_20B/source/wrepld/server.c Changeset: Modified: branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt === --- branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:02:40 UTC (rev 10898) +++ branches/tmp/SAMBA_3_0_20B/WHATSNEW.txt 2005-10-11 14:19:06 UTC (rev 10899) @@ -1,6 +1,6 @@ === - Release Notes for Samba 3.0.20a - Sept 30, 2005 + Release Notes for Samba 3.0.20b + Oct 11, 2005 === This is the latest stable release of Samba. This is the version @@ -8,6 +8,36 @@ bug-fixes. Please read the following important changes in this release. +Common bugs fixed in 3.0.20b include: + + o + + + +## +Changes +### + + +Changes since 3.0.20a +- + +commits +--- + +o Jeremy Allison <[EMAIL PROTECTED]> +o Gerald (Jerry) Carter <[EMAIL PROTECTED]> +o Volker Lendecke <[EMAIL PROTECTED]> + + +Release Notes for older release follow: + + -- + === + Release Notes for Samba 3.0.20a + Sept 30, 2005 + === + Common bugs fixed in 3.0.20a include: o Stability problems with winbindd. @@ -154,8 +184,6 @@ * BUG 3052: Fix compile issues on OpenBSD. -Release Notes for older release follow: - -- == Release Notes for Samba 3.0.20 Modified: branches/tmp/SAMBA_3_0_20B/source/VERSION === --- branches/tmp/SAMBA_3_0_20B/source/VERSION 2005-10-11 14:02:40 UTC (rev 10898) +++ branches/tmp/SAMBA_3_0_20B/source/VERSION 2005-10-11 14:19:06 UTC (rev 10899) @@ -31,7 +31,7 @@ # e.g. SAMBA_VERSION_REVISION=a# # -> "2.2.8a"# -SAMBA_VERSION_REVISION=a +SAMBA_VERSION_REVISION=b # For 'pre' releases the version will be # Modified: branches/tmp/SAMBA_3_0_20B/source/include/smb.h === --- branches/tmp/SAMBA_3_0_20B/source/include/smb.h 2005-10-11 14:02:40 UTC (rev 10898) +++ branches/tmp/SAMBA_3_0_20B/source/include/smb.h 2005-10-11 14:19:06 UTC (rev 10899) @@ -27,6 +27,10 @@ #ifndef _SMB_H #define _SMB_H +/* logged when starting the various Samba daemons */ +#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2005" + + #if defined(LARGE_SMB_OFF_T) #define BUFFER_SIZE (128*1024) #else /* no large readwrite possible */ Modified: branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c === --- branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c 2005-10-11 14:02:40 UTC (rev 10898) +++ branches/tmp/SAMBA_3_0_20B/source/nmbd/nmbd.c 2005-10-11 14:19:06 UTC (rev 10899) @@ -715,7 +715,7 @@ reopen_logs(); DEBUG( 0, ( "Netbios nameserver version %s started.\n", SAMBA_VERSION_STRING) ); - DEBUGADD( 0, ( "Copyright Andrew Tridgell and the Samba Team 1994-2004\n" ) ); + DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) ); if ( !reload_nmbd_services(False) ) return(-1); Modified: branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c === --- branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c 2005-10-11 14:02:40 UTC (rev 10898) +++ branches/tmp/SAMBA_3_0_20B/source/nsswitch/winbindd_misc.c 2005-10-11 14:19:06 UTC (rev 10899) @@ -131,7 +131,8 @@ if (num_domains > 0)
svn commit: samba r10898 - in branches/tmp: .
Author: jerry Date: 2005-10-11 14:02:40 + (Tue, 11 Oct 2005) New Revision: 10898 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10898 Log: creating tmp branch for the 3.0.20b release Added: branches/tmp/SAMBA_3_0_20B/ Changeset: Copied: branches/tmp/SAMBA_3_0_20B (from rev 10897, tags/release-3-0-20a)
svn commit: samba r10897 - in branches/SAMBA_4_0/source: dsdb dsdb/samdb/ldb_modules lib/ldb/common
Author: tridge Date: 2005-10-11 12:31:31 + (Tue, 11 Oct 2005) New Revision: 10897 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10897 Log: added in a hackish ldb proxy module that I am using to experiment with mmc management support Added: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c Modified: branches/SAMBA_4_0/source/dsdb/config.mk branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c Changeset: Sorry, the patch is too large (380 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10897
svn commit: samba r10896 - in branches/SAMBA_4_0/source/lib/replace: .
Author: tridge Date: 2005-10-11 12:30:34 + (Tue, 11 Oct 2005) New Revision: 10896 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10896 Log: added a strcasestr() replacement function Modified: branches/SAMBA_4_0/source/lib/replace/config.m4 branches/SAMBA_4_0/source/lib/replace/replace.c branches/SAMBA_4_0/source/lib/replace/replace.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/config.m4 === --- branches/SAMBA_4_0/source/lib/replace/config.m4 2005-10-11 12:25:55 UTC (rev 10895) +++ branches/SAMBA_4_0/source/lib/replace/config.m4 2005-10-11 12:30:34 UTC (rev 10896) @@ -45,7 +45,7 @@ AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror) AC_CHECK_FUNCS(timegm setenv vsyslog setlinebuf mktime ftruncate chsize rename) AC_CHECK_FUNCS(waitpid strnlen strlcpy strlcat innetgr initgroups memmove strdup) -AC_CHECK_FUNCS(pread pwrite strndup) +AC_CHECK_FUNCS(pread pwrite strndup strcasestr) AC_HAVE_DECL(setresuid, [#include ]) AC_HAVE_DECL(setresgid, [#include ]) AC_HAVE_DECL(errno, [#include ]) Modified: branches/SAMBA_4_0/source/lib/replace/replace.c === --- branches/SAMBA_4_0/source/lib/replace/replace.c 2005-10-11 12:25:55 UTC (rev 10895) +++ branches/SAMBA_4_0/source/lib/replace/replace.c 2005-10-11 12:30:34 UTC (rev 10896) @@ -22,6 +22,7 @@ #include "system/wait.h" #include "system/time.h" #include "system/network.h" +#include "system/iconv.h" void replace_dummy(void); void replace_dummy(void) {} @@ -534,4 +535,17 @@ } #endif - +#ifndef HAVE_STRCASESTR +char *strcasestr(const char *haystack, const char *needle) +{ + const char *s; + size_t nlen = strlen(needle); + for (s=haystack;*s;s++) { + if (toupper(*needle) == toupper(*s) && + strncasecmp(s, needle, nlen) == 0) { + return discard_const_p(char, s); + } + } + return NULL; +} +#endif Modified: branches/SAMBA_4_0/source/lib/replace/replace.h === --- branches/SAMBA_4_0/source/lib/replace/replace.h 2005-10-11 12:25:55 UTC (rev 10895) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2005-10-11 12:30:34 UTC (rev 10896) @@ -84,6 +84,10 @@ int rename(const char *zfrom, const char *zto); #endif +#ifndef HAVE_STRCASESTR +char *strcasestr(const char *haystack, const char *needle); +#endif + #ifndef HAVE_FTRUNCATE int ftruncate(int f,long l); #endif
svn commit: samba r10895 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Author: tridge Date: 2005-10-11 12:25:55 + (Tue, 11 Oct 2005) New Revision: 10895 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10895 Log: allow 'dn=string' searches to work again. Windows doesn't allow these, but they are so very useful for things like [EMAIL PROTECTED] that I think its worth supporting them Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c === --- branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c2005-10-11 11:00:16 UTC (rev 10894) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c2005-10-11 12:25:55 UTC (rev 10895) @@ -151,13 +151,8 @@ struct ldb_dn *valuedn; int ret; - /* catch the old method of dn matching */ - if (ldb_attr_cmp(tree->u.equality.attr, "dn") == 0) { - ldb_debug(ldb, LDB_DEBUG_FATAL, "attempt to match on 'dn' - should use distinguishedName"); - return 0; - } - - if (ldb_attr_cmp(tree->u.equality.attr, "distinguishedName") == 0) { + if (ldb_attr_cmp(tree->u.equality.attr, "dn") == 0 || + ldb_attr_cmp(tree->u.equality.attr, "distinguishedName") == 0) { valuedn = ldb_dn_explode_casefold(ldb, tree->u.equality.value.data); if (valuedn == NULL) { return 0;
svn commit: samba r10894 - in branches/SAMBA_4_0/source: auth/gensec dsdb/samdb lib lib/ldb/common lib/ldb/tools libnet nbt_server/wins rpc_server/drsuapi rpc_server/lsa rpc_server/samr
Author: tridge Date: 2005-10-11 11:00:16 + (Tue, 11 Oct 2005) New Revision: 10894 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10894 Log: make the handling of dn/distinguishedName much closer to real ldap. Also ensure we put a objectclass on our private ldb's, so they have some chance of being stored in ldap if you want to Modified: branches/SAMBA_4_0/source/auth/gensec/schannel_state.c branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/lib/gendb.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_match.c branches/SAMBA_4_0/source/lib/ldb/common/ldb_parse.c branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c Changeset: Sorry, the patch is too large (375 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10894
svn commit: samba r10893 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: tridge Date: 2005-10-11 10:53:28 + (Tue, 11 Oct 2005) New Revision: 10893 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10893 Log: add configure test for utime (needed for the previous utime patch) Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4 === --- branches/SAMBA_4_0/source/lib/tdb/config.m4 2005-10-11 06:21:07 UTC (rev 10892) +++ branches/SAMBA_4_0/source/lib/tdb/config.m4 2005-10-11 10:53:28 UTC (rev 10893) @@ -1,4 +1,4 @@ -AC_CHECK_FUNCS(mmap pread pwrite getpagesize) +AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime) AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h) AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])