svn commit: samba r11873 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze
Date: 2005-11-23 09:38:44 + (Wed, 23 Nov 2005)
New Revision: 11873
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11873
Log:
add some interval vars to the service context
metze
Modified:
branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-11-23
07:33:09 UTC (rev 11872)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c 2005-11-23
09:38:44 UTC (rev 11873)
@@ -43,6 +43,18 @@
return NT_STATUS_INTERNAL_DB_ERROR;
}
+ /* the default renew interval is 6 days */
+ service-config.renew_interval=
lp_parm_int(-1,wreplsrv,renew_interval, 6*24*60*60);
+
+ /* the default tombstone (extinction) interval is 6 days */
+ service-config.tombstone_interval=
lp_parm_int(-1,wreplsrv,tombstone_interval, 6*24*60*60);
+
+ /* the default tombstone (extinction) timeout is 1 day */
+ service-config.tombstone_timeout =
lp_parm_int(-1,wreplsrv,tombstone_timeout, 1*24*60*60);
+
+ /* the default verify interval is 24 days */
+ service-config.verify_interval =
lp_parm_int(-1,wreplsrv,verify_interval, 24*24*60*60);
+
return NT_STATUS_OK;
}
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h 2005-11-23
07:33:09 UTC (rev 11872)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h 2005-11-23
09:38:44 UTC (rev 11873)
@@ -223,6 +223,34 @@
/* the winsdb handle */
struct ldb_context *wins_db;
+ /* some configuration */
+ struct {
+ /*
+* the interval (in secs) till an active record will be marked
as RELEASED
+*/
+ uint32_t renew_interval;
+
+ /*
+* the interval (in secs) a record remains in RELEASED state,
+* before it will be marked as TOMBSTONE
+* (also known as extinction interval)
+*/
+ uint32_t tombstone_interval;
+
+ /*
+* the interval (in secs) a record remains in TOMBSTONE state,
+* before it will be removed from the database.
+* (also known as extinction timeout)
+*/
+ uint32_t tombstone_timeout;
+
+ /*
+* the interval (in secs) till a replica record will be verified
+* with the owning wins server
+*/
+ uint32_t verify_interval;
+ } config;
+
/* all incoming connections */
struct wreplsrv_in_connection *in_connections;
svn commit: samba r11874 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/passdb trunk/source/lib trunk/source/passdb
Author: gd Date: 2005-11-23 11:17:04 + (Wed, 23 Nov 2005) New Revision: 11874 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11874 Log: Merge LDAP connection setup in lib/smbldap.c and pdb_nds.c. Also allow to use START_TLS in the pdb_nds_update_login_attempts function when doing simple binds to eDir. Guenther Modified: branches/SAMBA_3_0/source/lib/smbldap.c branches/SAMBA_3_0/source/passdb/pdb_nds.c trunk/source/lib/smbldap.c trunk/source/passdb/pdb_nds.c Changeset: Sorry, the patch is too large (641 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11874
svn commit: samba-web r861 - in trunk/devel: .
Author: deryck Date: 2005-11-23 11:19:53 + (Wed, 23 Nov 2005) New Revision: 861 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=861 Log: Close li and add br / for space between sections. deryck Modified: trunk/devel/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2005-11-23 03:34:28 UTC (rev 860) +++ trunk/devel/index.html 2005-11-23 11:19:53 UTC (rev 861) @@ -109,10 +109,10 @@ lia href=http://www.cb1.com/~lkcl/ntdom/;http://www.cb1.com/~lkcl/ntdom//a/li lia href=/samba/ftp/specs/Archive of SMB/CIFS Protocol Drafts/a/li liChris Hertel's a href=http://www.linux-mag.com/2001-05/smb_01.html;quot;Understanding the Network Neighborhoodquot;/a and a href=http://ubiqx.org/cifs/;Implementing CIFS/a/li - liLuke Leighton's book with New Riders Publishing a href=http://www.amazon.com/exec/obidos/ASIN/1578701503/qid%3D1032301305/sr%3D11-1/ref%3Dsr%5F11%5F1/102-4220271-1136156;DCE/RPC over SMB: Samba and Windows NT Domain Internals/a, ISBN 1-57870-150-3.br/nbsp;/li + liLuke Leighton's book with New Riders Publishing a href=http://www.amazon.com/exec/obidos/ASIN/1578701503/qid%3D1032301305/sr%3D11-1/ref%3Dsr%5F11%5F1/102-4220271-1136156;DCE/RPC over SMB: Samba and Windows NT Domain Internals/a, ISBN 1-57870-150-3./li liThe a href=/samba/devel/smbtorture-raw-functions.txtsmbtorture documentation/a written by Stephen Zarkos are well worth reading - if you use the Samba test suite + if you use the Samba test suite/libr / /ul/li liGet a symbolic debugger (gdb, ddd, ups, etc...) and step through the smbd source code as it is running in response to a SMB call (or RPC) that you are interested in./li/ul ul
svn commit: samba r11875 - branches/SAMBA_3_0/source/libads trunk/source/libads
Author: gd
Date: 2005-11-23 11:21:16 + (Wed, 23 Nov 2005)
New Revision: 11875
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11875
Log:
Allow to use START_TLS (by manually setting ldap ssl = start_tls) for
LDAP connections to ADS (Windows 2003).
Guenther
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
trunk/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2005-11-23 11:17:04 UTC (rev
11874)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2005-11-23 11:21:16 UTC (rev
11875)
@@ -292,6 +292,11 @@
ldap_set_option(ads-ld, LDAP_OPT_PROTOCOL_VERSION, version);
+ status = ADS_ERROR(smb_ldap_start_tls(ads-ld, version));
+ if (!ADS_ERR_OK(status)) {
+ return status;
+ }
+
if (!ads-auth.user_name) {
/* have to use the userPrincipalName value here and
not servicePrincipalName; found by Guenther Deschner @
Sernet */
Modified: trunk/source/libads/ldap.c
===
--- trunk/source/libads/ldap.c 2005-11-23 11:17:04 UTC (rev 11874)
+++ trunk/source/libads/ldap.c 2005-11-23 11:21:16 UTC (rev 11875)
@@ -292,6 +292,11 @@
ldap_set_option(ads-ld, LDAP_OPT_PROTOCOL_VERSION, version);
+ status = ADS_ERROR(smb_ldap_start_tls(ads-ld, version));
+ if (!ADS_ERR_OK(status)) {
+ return status;
+ }
+
if (!ads-auth.user_name) {
/* have to use the userPrincipalName value here and
not servicePrincipalName; found by Guenther Deschner @
Sernet */
svn commit: samba r11876 - branches/SAMBA_3_0/source/lib trunk/source/lib
Author: gd
Date: 2005-11-23 11:29:55 + (Wed, 23 Nov 2005)
New Revision: 11876
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11876
Log:
When we are using START_TLS to secure the LDAP connection, we *have* to
call START_TLS again after rebinding to another LDAP server. (ldaps://
uri's are handled at by recent versions of OpenLDAP).
Guenther
Modified:
branches/SAMBA_3_0/source/lib/smbldap.c
trunk/source/lib/smbldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===
--- branches/SAMBA_3_0/source/lib/smbldap.c 2005-11-23 11:21:16 UTC (rev
11875)
+++ branches/SAMBA_3_0/source/lib/smbldap.c 2005-11-23 11:29:55 UTC (rev
11876)
@@ -777,9 +777,18 @@
{
struct smbldap_state *ldap_state = arg;
int rc;
- DEBUG(5,(rebindproc_connect_with_state: Rebinding as \%s\\n,
-ldap_state-bind_dn));
-
+ int version;
+
+ DEBUG(5,(rebindproc_connect_with_state: Rebinding to %s as \%s\\n,
+url, ldap_state-bind_dn));
+
+ /* call START_TLS again (ldaps:// is handled by the OpenLDAP library
+* itself) before rebinding to another LDAP server to avoid to expose
+* our credentials. At least *try* to secure the connection - Guenther
*/
+
+ smb_ldap_upgrade_conn(ldap_struct, version);
+ smb_ldap_start_tls(ldap_struct, version);
+
/** @TODO Should we be doing something to check what servers we rebind
to?
Could we get a referral to a machine that we don't want to give our
username and password to? */
Modified: trunk/source/lib/smbldap.c
===
--- trunk/source/lib/smbldap.c 2005-11-23 11:21:16 UTC (rev 11875)
+++ trunk/source/lib/smbldap.c 2005-11-23 11:29:55 UTC (rev 11876)
@@ -777,9 +777,18 @@
{
struct smbldap_state *ldap_state = arg;
int rc;
- DEBUG(5,(rebindproc_connect_with_state: Rebinding as \%s\\n,
-ldap_state-bind_dn));
-
+ int version;
+
+ DEBUG(5,(rebindproc_connect_with_state: Rebinding to %s as \%s\\n,
+url, ldap_state-bind_dn));
+
+ /* call START_TLS again (ldaps:// is handled by the OpenLDAP library
+* itself) before rebinding to another LDAP server to avoid to expose
+* our credentials. At least *try* to secure the connection - Guenther
*/
+
+ smb_ldap_upgrade_conn(ldap_struct, version);
+ smb_ldap_start_tls(ldap_struct, version);
+
/** @TODO Should we be doing something to check what servers we rebind
to?
Could we get a referral to a machine that we don't want to give our
username and password to? */
svn commit: samba r11877 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze Date: 2005-11-23 11:34:46 + (Wed, 23 Nov 2005) New Revision: 11877 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11877 Log: - give winsdb_add/modify/delete() ldb_context as first argument and add a flags argument to add and modify,the current flags are: WINSDB_FLAG_ALLOC_VERSION to allocate a new version id for the record WINSDB_FLAG_TAKE_OWNERSHIP to take the become the wins owner of the record - fix handling of records with no addresses, this is valid for MHOMED and SGROUP records when they're not in ACTIVE state metze Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c branches/SAMBA_4_0/source/nbt_server/wins/winswack.c Changeset: Sorry, the patch is too large (340 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11877
svn commit: samba r11878 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze Date: 2005-11-23 11:37:54 + (Wed, 23 Nov 2005) New Revision: 11878 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11878 Log: don't get only newer records than the last one we got metze Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c Changeset: Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c === --- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c 2005-11-23 11:34:46 UTC (rev 11877) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_helpers.c 2005-11-23 11:37:54 UTC (rev 11878) @@ -577,7 +577,7 @@ state-names_io.in.partner = state-io-in.partner; state-names_io.in.wreplconn= state-io-in.wreplconn; state-names_io.in.owner= current_owner-owner; - state-names_io.in.owner.min_version= old_max_version; + state-names_io.in.owner.min_version= old_max_version + 1; state-creq = wreplsrv_pull_names_send(state, state-names_io); NT_STATUS_HAVE_NO_MEMORY(state-creq);
svn commit: samba r11879 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze Date: 2005-11-23 12:19:38 + (Wed, 23 Nov 2005) New Revision: 11879 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11879 Log: some fixes for the new ldb api metze Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c Changeset: Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c === --- branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c 2005-11-23 11:37:54 UTC (rev 11878) +++ branches/SAMBA_4_0/source/wrepl_server/wrepl_in_call.c 2005-11-23 12:19:38 UTC (rev 11879) @@ -264,13 +264,13 @@ } /* sort the names before we send them */ - qsort(names, ret, sizeof(struct wrepl_wins_name), (comparison_fn_t)wreplsrv_in_sort_wins_name); + qsort(names, res-count, sizeof(struct wrepl_wins_name), (comparison_fn_t)wreplsrv_in_sort_wins_name); DEBUG(2,(WINSREPL:reply [%u] records owner[%s] min[%llu] max[%llu] to partner[%s]\n, - ret, owner_in-address, owner_in-min_version, owner_in-max_version, + res-count, owner_in-address, owner_in-min_version, owner_in-max_version, call-wreplconn-partner-address)); - reply_out-num_names= ret; + reply_out-num_names= res-count; reply_out-names= names; return NT_STATUS_OK;
svn commit: samba r11880 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze Date: 2005-11-23 12:24:12 + (Wed, 23 Nov 2005) New Revision: 11880 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11880 Log: - we finally start to apply replicas to our database - currently only the ADD, REPLACE and NOT REPLACE cases are handled complete - other cases are just skiped for now metze Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c Changeset: Sorry, the patch is too large (464 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11880
svn commit: samba r11881 - in branches/SAMBA_4_0/source/wrepl_server: .
Author: metze
Date: 2005-11-23 12:29:37 + (Wed, 23 Nov 2005)
New Revision: 11881
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11881
Log:
fix debug messages
metze
Modified:
branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c
Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c
===
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c
2005-11-23 12:24:12 UTC (rev 11880)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_apply_records.c
2005-11-23 12:29:37 UTC (rev 11881)
@@ -588,7 +588,7 @@
return NT_STATUS_FOOBAR;
}
- DEBUG(0,(added record %s\n,
+ DEBUG(4,(added record %s\n,
nbt_name_string(mem_ctx, replica-name)));
return NT_STATUS_OK;
@@ -631,7 +631,7 @@
return NT_STATUS_FOOBAR;
}
- DEBUG(0,(replaced record %s\n,
+ DEBUG(4,(replaced record %s\n,
nbt_name_string(mem_ctx, replica-name)));
return NT_STATUS_OK;
@@ -643,7 +643,7 @@
struct wrepl_wins_owner *owner,
struct wrepl_name *replica)
{
- DEBUG(0,(TODO: not replace record %s\n,
+ DEBUG(4,(not replace record %s\n,
nbt_name_string(mem_ctx, replica-name)));
return NT_STATUS_OK;
}
@@ -709,16 +709,11 @@
BOOL replica_vs_replica = False;
BOOL local_vs_replica = False;
- DEBUG(0,(apply record %s: from: %s %llu\n,
-nbt_name_string(mem_ctx, replica-name), owner-address,
replica-version_id));
-
status = winsdb_lookup(partner-service-wins_db,
replica-name, mem_ctx, rec);
if (NT_STATUS_EQUAL(NT_STATUS_OBJECT_NAME_NOT_FOUND, status)) {
return r_do_add(partner, mem_ctx, owner, replica);
}
- DEBUG(0,(apply record %s: s1: %s\n,
-nbt_name_string(mem_ctx, replica-name), nt_errstr(status)));
NT_STATUS_NOT_OK_RETURN(status);
if (strcmp(rec-wins_owner, WINSDB_OWNER_LOCAL)==0) {
@@ -729,9 +724,6 @@
replica_vs_replica = True;
}
- DEBUG(0,(apply record %s: s2: lvr:%d so:%d rvr:%d\n,
-nbt_name_string(mem_ctx, replica-name), local_vs_replica,
same_owner, replica_vs_replica));
-
if (rec-is_static !same_owner) {
/* TODO: this is just assumed and needs to be tested more */
action = R_NOT_REPLACE;
@@ -769,7 +761,7 @@
}
}
- DEBUG(0,(apply record %s: %s\n,
+ DEBUG(4,(apply record %s: %s\n,
nbt_name_string(mem_ctx, replica-name),
_R_ACTION_enum_string(action)));
switch (action) {
@@ -794,8 +786,7 @@
NTSTATUS status;
uint32_t i;
- /* TODO: ! */
- DEBUG(0,(TODO: apply records
count[%u]:owner[%s]:min[%llu]:max[%llu]:partner[%s]\n,
+ DEBUG(4,(apply records
count[%u]:owner[%s]:min[%llu]:max[%llu]:partner[%s]\n,
names_io-out.num_names, names_io-in.owner.address,
names_io-in.owner.min_version, names_io-in.owner.max_version,
partner-address));
svn commit: samba r11883 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: vlendec
Date: 2005-11-23 15:52:23 + (Wed, 23 Nov 2005)
New Revision: 11883
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11883
Log:
Also look up the membership in the domain local groups.
Volker
Modified:
branches/SAMBA_4_0/source/torture/rpc/xplogin.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/xplogin.c
===
--- branches/SAMBA_4_0/source/torture/rpc/xplogin.c 2005-11-23 12:30:57 UTC
(rev 11882)
+++ branches/SAMBA_4_0/source/torture/rpc/xplogin.c 2005-11-23 15:52:23 UTC
(rev 11883)
@@ -1147,6 +1147,10 @@
struct samr_Close c;
struct samr_GetGroupsForUser g;
+ struct lsa_SidArray sids;
+ struct samr_GetAliasMembership ga;
+ struct samr_Ids samr_ids;
+
uint32_t *rids;
struct samr_LookupRids r;
};
@@ -1214,7 +1218,7 @@
composite_continue_rpc(c, req, memberships_recv_closeuser, c);
}
-static void memberships_recv_mem(struct rpc_request *req)
+static void memberships_recv_aliases(struct rpc_request *req)
{
struct composite_context *c =
talloc_get_type(req-async.private,
@@ -1222,23 +1226,36 @@
struct memberships_state *state =
talloc_get_type(c-private_data,
struct memberships_state);
- int i, num_rids;
+ int i, rid_index, num_rids;
c-status = dcerpc_ndr_request_recv(req);
if (!composite_is_ok(c)) return;
- c-status = state-g.out.result;
+ c-status = state-ga.out.result;
if (!composite_is_ok(c)) return;
- num_rids = state-g.out.rids-count;
+ num_rids = state-g.out.rids-count +
+ state-ga.out.rids-count + 1;
+
state-rids = talloc_array(state, uint32_t, num_rids);
if (composite_nomem(state-rids, c)) return;
- for (i=0; inum_rids; i++) {
- state-rids[i] = state-g.out.rids-rids[i].rid;
+ rid_index = 0;
+
+ /* User */
+ state-rids[rid_index++] = state-l.out.rids.ids[0];
+
+ /* Groups */
+ for (i=0; istate-g.out.rids-count; i++) {
+ state-rids[rid_index++] = state-g.out.rids-rids[i].rid;
}
+ /* Aliases (aka domain local groups) */
+ for (i=0; istate-ga.out.rids-count; i++) {
+ state-rids[rid_index++] = state-ga.out.rids-ids[i];
+ }
+
state-r.in.domain_handle = state-domain_handle;
- state-r.in.num_rids = state-g.out.rids-count;
+ state-r.in.num_rids = num_rids;
state-r.in.rids = state-rids;
req = dcerpc_samr_LookupRids_send(state-samr_pipe, state,
@@ -1246,6 +1263,48 @@
composite_continue_rpc(c, req, memberships_recv_names, c);
}
+static void memberships_recv_mem(struct rpc_request *req)
+{
+ struct composite_context *c =
+ talloc_get_type(req-async.private,
+ struct composite_context);
+ struct memberships_state *state =
+ talloc_get_type(c-private_data,
+ struct memberships_state);
+ int i;
+
+ c-status = dcerpc_ndr_request_recv(req);
+ if (!composite_is_ok(c)) return;
+ c-status = state-g.out.result;
+ if (!composite_is_ok(c)) return;
+
+ state-sids.num_sids = state-g.out.rids-count+1;
+ state-sids.sids = talloc_array(state, struct lsa_SidPtr,
+ state-sids.num_sids);
+
+ if (composite_nomem(state-sids.sids, c)) return;
+
+ state-sids.sids[0].sid = dom_sid_add_rid(state-sids.sids,
+ state-domain_sid,
+ state-l.out.rids.ids[0]);
+ if (composite_nomem(state-sids.sids[0].sid, c)) return;
+
+ for (i=0; istate-g.out.rids-count; i++) {
+ state-sids.sids[i+1].sid = dom_sid_add_rid(
+ state-sids.sids, state-domain_sid,
+ state-g.out.rids-rids[i].rid);
+ if (composite_nomem(state-sids.sids[i+1].sid, c)) return;
+ }
+
+ state-ga.in.sids = state-sids;
+ state-ga.in.domain_handle = state-domain_handle;
+ state-ga.out.rids = state-samr_ids;
+
+ req = dcerpc_samr_GetAliasMembership_send(state-samr_pipe, state,
+ state-ga);
+ composite_continue_rpc(c, req, memberships_recv_aliases, c);
+}
+
static void memberships_recv_user(struct rpc_request *req)
{
struct composite_context *c =
@@ -1393,6 +1452,8 @@
int num_domadmins;
struct wb_sid_object **domadmins;
+ int num_memberships_done;
+
struct smb_composite_connect conn;
struct cli_credentials *wks_creds;
struct dcerpc_pipe *netlogon_pipe;
@@ -1731,6 +1792,8 @@
state-domadmins);
if (!composite_is_ok(c)) return;
svn commit: samba r11884 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: vlendec Date: 2005-11-23 17:21:08 + (Wed, 23 Nov 2005) New Revision: 11884 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11884 Log: Download ntconfig.pol Modified: branches/SAMBA_4_0/source/torture/rpc/xplogin.c Changeset: Sorry, the patch is too large (252 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11884
svn commit: samba r11885 - in branches/SAMBA_4_0/source: include libcli/composite
Author: vlendec
Date: 2005-11-23 18:49:30 + (Wed, 23 Nov 2005)
New Revision: 11885
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11885
Log:
Add forgotten files
Modified:
branches/SAMBA_4_0/source/include/structs.h
branches/SAMBA_4_0/source/libcli/composite/composite.c
Changeset:
Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-11-23 17:21:08 UTC (rev
11884)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-11-23 18:49:30 UTC (rev
11885)
@@ -338,6 +338,7 @@
struct socket_context;
struct smbcli_socket;
+struct smbcli_request;
struct _krb5_krb_auth_data;
Modified: branches/SAMBA_4_0/source/libcli/composite/composite.c
===
--- branches/SAMBA_4_0/source/libcli/composite/composite.c 2005-11-23
17:21:08 UTC (rev 11884)
+++ branches/SAMBA_4_0/source/libcli/composite/composite.c 2005-11-23
18:49:30 UTC (rev 11885)
@@ -147,3 +147,12 @@
new_req-async.private = private_data;
}
+void composite_continue_smb(struct composite_context *ctx,
+ struct smbcli_request *new_req,
+ void (*continuation)(struct smbcli_request *),
+ void *private_data)
+{
+ if (composite_nomem(new_req, ctx)) return;
+ new_req-async.fn = continuation;
+ new_req-async.private = private_data;
+}
svn commit: samba r11886 - branches/SAMBA_3_0/source/auth trunk/source/auth
Author: jmcd
Date: 2005-11-23 22:08:57 + (Wed, 23 Nov 2005)
New Revision: 11886
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11886
Log:
Fix 3187: logon hours restrictions were off corresponding to our offset from
GMT. Use gmtime() instead of localtime() in the calc, but still use
localtime() in displaying it.
Modified:
branches/SAMBA_3_0/source/auth/auth_sam.c
trunk/source/auth/auth_sam.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_sam.c
===
--- branches/SAMBA_3_0/source/auth/auth_sam.c 2005-11-23 18:49:30 UTC (rev
11885)
+++ branches/SAMBA_3_0/source/auth/auth_sam.c 2005-11-23 22:08:57 UTC (rev
11886)
@@ -88,7 +88,7 @@
}
lasttime = (time_t)smb_last_time.tv_sec;
- utctime = localtime(lasttime);
+ utctime = gmtime(lasttime);
/* find the corresponding byte and bit */
bitpos = (utctime-tm_wday * 24 + utctime-tm_hour) % 168;
@@ -96,7 +96,8 @@
if (! (hours[bitpos/8] bitmask)) {
DEBUG(1,(logon_hours_ok: Account for user %s not allowed to
logon at this time (%s).\n,
- pdb_get_username(sampass), asctime(utctime) ));
+ pdb_get_username(sampass),
+ asctime(localtime(lasttime)) ));
return False;
}
Modified: trunk/source/auth/auth_sam.c
===
--- trunk/source/auth/auth_sam.c2005-11-23 18:49:30 UTC (rev 11885)
+++ trunk/source/auth/auth_sam.c2005-11-23 22:08:57 UTC (rev 11886)
@@ -88,7 +88,7 @@
}
lasttime = (time_t)smb_last_time.tv_sec;
- utctime = localtime(lasttime);
+ utctime = gmtime(lasttime);
/* find the corresponding byte and bit */
bitpos = (utctime-tm_wday * 24 + utctime-tm_hour) % 168;
@@ -96,7 +96,8 @@
if (! (hours[bitpos/8] bitmask)) {
DEBUG(1,(logon_hours_ok: Account for user %s not allowed to
logon at this time (%s).\n,
- pdb_get_username(sampass), asctime(utctime) ));
+ pdb_get_username(sampass),
+ asctime(localtime(lasttime)) ));
return False;
}
Build status as of Thu Nov 24 00:00:02 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-11-23 00:00:35.0 + +++ /home/build/master/cache/broken_results.txt 2005-11-24 00:00:11.0 + @@ -1,17 +1,17 @@ -Build status as of Wed Nov 23 00:00:02 2005 +Build status as of Thu Nov 24 00:00:02 2005 Build counts: Tree Total Broken Panic -ccache 35 6 0 -distcc 35 4 0 -lorikeet-heimdal 30 30 0 +ccache 36 6 0 +distcc 36 4 0 +lorikeet-heimdal 31 31 0 ppp 18 0 0 -rsync34 1 0 +rsync35 2 0 samba3 0 0 samba-docs 0 0 0 -samba4 34 19 0 -samba_3_034 7 0 +samba4 35 21 0 +samba_3_035 6 0 smb-build30 5 0 -talloc 32 14 0 -tdb 32 3 0 +talloc 33 14 0 +tdb 33 4 0
