svn commit: samba r21306 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-02-13 08:08:23 + (Tue, 13 Feb 2007)
New Revision: 21306
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21306
Log:
fix the RPC-LSA tests the admin couldn't no longer get the 'currentValue'
attribute...
this needs more works, but make it work again for now
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-02-13 03:52:57 UTC (rev 21305)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-02-13 08:08:23 UTC (rev 21306)
@@ -126,6 +126,7 @@
{
switch (ac-user_type) {
case SYSTEM:
+ case ADMINISTRATOR:
break;
default:
/* remove password attributes */
svn commit: samba r21307 - in branches/SAMBA_4_0/source/libcli/security: .
Author: metze
Date: 2007-02-13 09:27:56 + (Tue, 13 Feb 2007)
New Revision: 21307
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21307
Log:
make it possible to pass in NULL for domain or rid,
if someone isn't interessted in one of it
metze
Modified:
branches/SAMBA_4_0/source/libcli/security/dom_sid.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/dom_sid.c
===
--- branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2007-02-13 08:08:23 UTC
(rev 21306)
+++ branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2007-02-13 09:27:56 UTC
(rev 21307)
@@ -225,12 +225,18 @@
return NT_STATUS_INVALID_PARAMETER;
}
- if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
- return NT_STATUS_NO_MEMORY;
+ if (domain) {
+ if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ (*domain)-num_auths -= 1;
}
- (*domain)-num_auths -= 1;
- *rid = (*domain)-sub_auths[(*domain)-num_auths];
+ if (rid) {
+ *rid = sid-sub_auths[sid-num_auths - 1];
+ }
+
return NT_STATUS_OK;
}
svn commit: samba r21308 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 10:42:53 + (Tue, 13 Feb 2007)
New Revision: 21308
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21308
Log:
Fix some typos and ensure to null terminate the correct strings.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -837,7 +837,7 @@
char *name_domain, *name_account;
if ( !root_domain ) {
- DEBUG(5,(lookupname_recv: unable determine forest
root\n));
+ DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
cont(private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
@@ -907,10 +907,10 @@
char *p;
/* Ensure null termination */
-
state-request.data.sid[sizeof(state-request.data.name.dom_name)-1]='\0';
+
state-request.data.name.dom_name[sizeof(state-request.data.name.dom_name)-1]='\0';
/* Ensure null termination */
- state-request.data.sid[sizeof(state-request.data.name.name)-1]='\0';
+
state-request.data.name.name[sizeof(state-request.data.name.name)-1]='\0';
/* cope with the name being a fully qualified name */
p = strstr(state-request.data.name.name, lp_winbind_separator());
@@ -926,7 +926,7 @@
DEBUG(3, ([%5lu]: lookupname %s%s%s\n, (unsigned long)state-pid,
name_domain, lp_winbind_separator(), name_user));
- /* Lookup name from PDC using lsa_lookup_names() */
+ /* Lookup name from DC using lsa_lookup_names() */
if (!winbindd_lookup_sid_by_name(state-mem_ctx, domain, name_domain,
name_user, sid, type)) {
return WINBINDD_ERROR;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -262,7 +262,7 @@
return NT_STATUS_NO_MEMORY;
}
- ws_name_return( full_name, '_' );
+ ws_name_return( full_name, '_' );
DEBUG(3,(name_to_sid [rpc] %s for domain %s\n,
full_name?full_name:, domain_name ));
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -716,7 +716,7 @@
/* Lookup name */
result = domain-methods-name_to_sid(domain, mem_ctx, domain_name,
name, sid, type);
- /* Return rid and type if lookup successful */
+ /* Return sid and type if lookup successful */
if (!NT_STATUS_IS_OK(result)) {
*type = SID_NAME_UNKNOWN;
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c 2007-02-13
09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c 2007-02-13
10:42:53 UTC (rev 21308)
@@ -837,7 +837,7 @@
char *name_domain, *name_account;
if ( !root_domain ) {
- DEBUG(5,(lookupname_recv: unable determine forest
root\n));
+ DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
cont(private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
@@ -907,10 +907,10 @@
char *p;
/* Ensure null termination */
-
state-request.data.sid[sizeof(state-request.data.name.dom_name)-1]='\0';
+
state-request.data.name.dom_name[sizeof(state-request.data.name.dom_name)-1]='\0';
/* Ensure null termination */
- state-request.data.sid[sizeof(state-request.data.name.name)-1]='\0';
+
state-request.data.name.name[sizeof(state-request.data.name.name)-1]='\0';
/* cope with the name being a fully qualified name */
p = strstr(state-request.data.name.name, lp_winbind_separator());
@@ -926,7
svn commit: samba r21309 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 10:56:04 + (Tue, 13 Feb 2007)
New Revision: 21309
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21309
Log:
Add PRINTF_ATTRIBUTE checks for log statements.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:42:53 UTC
(rev 21308)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:56:04 UTC
(rev 21309)
@@ -78,6 +78,7 @@
return on(ctrl, WINBIND_SILENT);
}
+static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...)
{
va_list args;
@@ -117,6 +118,7 @@
return _pam_log_is_debug_enabled(ctrl);
}
+static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...)
{
va_list args;
@@ -413,6 +415,7 @@
return ret;
}
+static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...)
{
int ret;
Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:42:53 UTC
(rev 21308)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:56:04 UTC
(rev 21309)
@@ -78,6 +78,7 @@
return on(ctrl, WINBIND_SILENT);
}
+static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...)
{
va_list args;
@@ -117,6 +118,7 @@
return _pam_log_is_debug_enabled(ctrl);
}
+static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...)
{
va_list args;
@@ -413,6 +415,7 @@
return ret;
}
+static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...)
{
int ret;
svn commit: samba r21310 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 11:04:10 + (Tue, 13 Feb 2007)
New Revision: 21310
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21310
Log:
Fix invalid printfs in pam_winbind.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:56:04 UTC
(rev 21309)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 11:04:10 UTC
(rev 21310)
@@ -461,8 +461,12 @@
case WINBINDD_GETPWNAM:
case WINBINDD_LOOKUPNAME:
- _pam_log(pamh, ctrl, LOG_ERR, request failed: %s, NT
error was %s,
+ if (strlen(response-data.auth.nt_status_string) 0) {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed,
NT error was %s,
response-data.auth.nt_status_string);
+ } else {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed);
+ }
return PAM_USER_UNKNOWN;
default:
break;
@@ -518,15 +522,19 @@
}
return retval;
case PAM_SUCCESS:
- if (req_type == WINBINDD_PAM_AUTH) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' granted
access, user);
- } else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' password
changed, user);
- } else {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' OK, user);
+ /* Otherwise, the authentication looked good */
+ switch (req_type) {
+ case WINBINDD_INFO:
+ break;
+ case WINBINDD_PAM_AUTH:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
granted access, user);
+ break;
+ case WINBINDD_PAM_CHAUTHTOK:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
password changed, user);
+ break;
+ default:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
OK, user);
+ break;
}
return retval;
@@ -1101,8 +1109,8 @@
if (already_expired == True) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, Password has
expired
- (Password was last set: %d, the policy
says
- it should expire here %d (now it's:
%d))\n,
+ (Password was last set: %lld, the
policy says
+ it should expire here %lld (now it's:
%lu))\n,
response.data.auth.info3.pass_last_set_time,
response.data.auth.info3.pass_last_set_time +
response.data.auth.policy.expire,
Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:56:04 UTC
(rev 21309)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 11:04:10 UTC
(rev 21310)
@@ -461,8 +461,12 @@
case WINBINDD_GETPWNAM:
case WINBINDD_LOOKUPNAME:
- _pam_log(pamh, ctrl, LOG_ERR, request failed: %s, NT
error was %s,
+ if (strlen(response-data.auth.nt_status_string) 0) {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed,
NT error was %s,
response-data.auth.nt_status_string);
+ } else {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed);
+ }
return PAM_USER_UNKNOWN;
default:
break;
@@ -518,15 +522,19 @@
}
return retval;
case PAM_SUCCESS:
- if (req_type == WINBINDD_PAM_AUTH) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' granted
access, user);
- } else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
-
svn commit: samba r21311 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
Author: metze
Date: 2007-02-13 12:32:48 + (Tue, 13 Feb 2007)
New Revision: 21311
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21311
Log:
fix very ugly using free'ed memory bug
This was there since 2005...
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
11:04:10 UTC (rev 21310)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:32:48 UTC (rev 21311)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21312 - in branches/SAMBA_3_0/source/lib/ldb/ldb_tdb: .
Author: metze
Date: 2007-02-13 12:42:28 + (Tue, 13 Feb 2007)
New Revision: 21312
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21312
Log:
merge from SAMBA_4_0:
fix memory hierachy, and access to already freed memory
metze
Modified:
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:32:48 UTC (rev 21311)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:42:28 UTC (rev 21312)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21313 - in branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb: .
Author: vlendec
Date: 2007-02-13 12:48:54 + (Tue, 13 Feb 2007)
New Revision: 21313
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21313
Log:
Janitor for metze :-)
Modified:
branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c2007-02-13
12:42:28 UTC (rev 21312)
+++ branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c2007-02-13
12:48:54 UTC (rev 21313)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21314 - in branches/SAMBA_4_0/source/auth/credentials: .
Author: metze
Date: 2007-02-13 13:14:14 + (Tue, 13 Feb 2007)
New Revision: 21314
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21314
Log:
add more usefull debug output
metze
Modified:
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-13 12:48:54 UTC (rev 21313)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-13 13:14:14 UTC (rev 21314)
@@ -226,15 +226,15 @@
msgs, attrs,
%s, filter);
if (ldb_ret == 0) {
- DEBUG(1, (Could not find entry to match filter: %s\n,
- filter));
+ DEBUG(1, (Could not find entry to match filter: '%s' base:
'%s'\n,
+ filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
} else if (ldb_ret != 1) {
- DEBUG(1, (Found more than one (%d) entry to match filter:
%s\n,
- ldb_ret, filter));
+ DEBUG(1, (Found more than one (%d) entry to match filter: '%s'
base: '%s'\n,
+ ldb_ret, filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
@@ -247,8 +247,8 @@
machine_account = ldb_msg_find_attr_as_string(msgs[0],
samAccountName, NULL);
if (!machine_account) {
- DEBUG(1, (Could not find 'samAccountName' in join record to
domain: %s\n,
- cli_credentials_get_domain(cred)));
+ DEBUG(1, (Could not find 'samAccountName' in join record to
domain: %s: filter: '%s' base: '%s'\n,
+ cli_credentials_get_domain(cred), filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
Re: svn commit: samba r21311 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
On Tue, 2007-02-13 at 12:32 +, [EMAIL PROTECTED] wrote: Author: metze Date: 2007-02-13 12:32:48 + (Tue, 13 Feb 2007) New Revision: 21311 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21311 Log: fix very ugly using free'ed memory bug This was there since 2005... Thanks! Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org
svn commit: samba r21315 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-02-13 13:43:23 + (Tue, 13 Feb 2007)
New Revision: 21315
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21315
Log:
ldb now supports filters like
((dn=%s)((objectClass=kerberosSecret)(privateKeytab=*))) again
we can use such a filter:-)
we should only update the keytab for records matching this filter,
that means we need to do a search before calling cli_credentials_set_secrets()
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
2007-02-13 13:14:14 UTC (rev 21314)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
2007-02-13 13:43:23 UTC (rev 21315)
@@ -45,10 +45,38 @@
static int add_modified(struct ldb_module *module, struct ldb_dn *dn, BOOL
delete) {
struct update_kt_private *data = talloc_get_type(module-private_data,
struct update_kt_private);
- struct dn_list *item = talloc(data-changed_dns? (void
*)data-changed_dns: (void *)data, struct dn_list);
+ struct dn_list *item;
char *filter;
+ struct ldb_result *res;
+ const char *attrs[] = { NULL };
+ int ret;
NTSTATUS status;
+
+ filter = talloc_asprintf(data,
((dn=%s)((objectClass=kerberosSecret)(privateKeytab=*))),
+ldb_dn_get_linearized(dn));
+ if (!filter) {
+ ldb_oom(module-ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ret = ldb_search(module-ldb, dn, LDB_SCOPE_BASE,
+filter, attrs, res);
+ if (ret != LDB_SUCCESS) {
+ talloc_free(filter);
+ return ret;
+ }
+
+ if (res-count != 1) {
+ /* if it's not a kerberosSecret then we don't have anything to
update */
+ talloc_free(res);
+ talloc_free(filter);
+ return LDB_SUCCESS;
+ }
+ talloc_free(res);
+
+ item = talloc(data-changed_dns? (void *)data-changed_dns: (void
*)data, struct dn_list);
if (!item) {
+ talloc_free(filter);
ldb_oom(module-ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -56,14 +84,12 @@
item-creds = cli_credentials_init(item);
if (!item-creds) {
DEBUG(1, (cli_credentials_init failed!));
+ talloc_free(filter);
ldb_oom(module-ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
cli_credentials_set_conf(item-creds);
-/* filter = talloc_asprintf(item,
objectClass=kerberosSecret)(privateKeytab=*))(|(secret=*)(ntPwdHash=*)))(distinguishedName=%s)),
*/
- filter = talloc_asprintf(item, dn=%s,
-ldb_dn_get_linearized(dn));
status = cli_credentials_set_secrets(item-creds, module-ldb, NULL,
filter);
talloc_free(filter);
if (NT_STATUS_IS_OK(status)) {
svn commit: samba r21316 - in branches/SAMBA_4_0/source/libcli/nbt: .
Author: metze
Date: 2007-02-13 15:17:29 + (Tue, 13 Feb 2007)
New Revision: 21316
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21316
Log:
if we got an unexpected nbt packet that most times mean
we got a 2nd answer to a broadcast message and have already remove
the packet id from out list while getting the first response
metze
Modified:
branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
===
--- branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c2007-02-13 13:43:23 UTC
(rev 21315)
+++ branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c2007-02-13 15:17:29 UTC
(rev 21316)
@@ -215,7 +215,7 @@
if (nbtsock-unexpected.handler) {
nbtsock-unexpected.handler(nbtsock, packet, src);
} else {
- DEBUG(2,(Failed to match request for incoming name
packet id 0x%04x on %p\n,
+ DEBUG(10,(Failed to match request for incoming name
packet id 0x%04x on %p\n,
packet-name_trn_id, nbtsock));
}
talloc_free(tmp_ctx);
svn commit: samba r21317 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze
Date: 2007-02-13 15:20:44 + (Tue, 13 Feb 2007)
New Revision: 21317
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21317
Log:
this happens very often when you have multihomed nodes
and isn't an error.
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2007-02-13
15:17:29 UTC (rev 21316)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2007-02-13
15:20:44 UTC (rev 21317)
@@ -217,7 +217,7 @@
if (!NT_STATUS_IS_OK(status) ||
rec2-version != rec-version ||
strcmp(rec2-wins_owner, rec-wins_owner) != 0) {
- DEBUG(1,(WINS: record %s changed during WACK - failing
registration\n,
+ DEBUG(5,(WINS: record %s changed during WACK - failing
registration\n,
nbt_name_string(s, rec-name)));
wins_wack_deny(s);
return;
svn commit: samba r21318 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 15:56:09 + (Tue, 13 Feb 2007)
New Revision: 21318
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21318
Log:
Fix Bug #4225.
Cached logon with pam_winbind should work now also for NT4 and samba3
domains.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_pam.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 15:20:44 UTC
(rev 21317)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 15:56:09 UTC
(rev 21318)
@@ -1029,14 +1029,9 @@
request.flags = WBFLAG_PAM_INFO3_TEXT | WBFLAG_PAM_CONTACT_TRUSTDOM;
- if (ctrl WINBIND_KRB5_AUTH) {
-
+ if (ctrl (WINBIND_KRB5_AUTH|WINBIND_CACHED_LOGIN)) {
struct passwd *pwd = NULL;
- _pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling krb5 login
flag\n);
-
- request.flags |= WBFLAG_PAM_KRB5 |
WBFLAG_PAM_FALLBACK_AFTER_KRB5;
-
pwd = getpwnam(user);
if (pwd == NULL) {
return PAM_USER_UNKNOWN;
@@ -1044,6 +1039,13 @@
request.data.auth.uid = pwd-pw_uid;
}
+ if (ctrl WINBIND_KRB5_AUTH) {
+
+ _pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling krb5 login
flag\n);
+
+ request.flags |= WBFLAG_PAM_KRB5 |
WBFLAG_PAM_FALLBACK_AFTER_KRB5;
+ }
+
if (ctrl WINBIND_CACHED_LOGIN) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling cached login
flag\n);
request.flags |= WBFLAG_PAM_CACHED_LOGIN;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2007-02-13 15:20:44 UTC
(rev 21317)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2007-02-13 15:56:09 UTC
(rev 21318)
@@ -866,15 +866,12 @@
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
- /* The info3 acct_flags in NT4's samlogon reply don't have
-* ACB_NORMAL set. */
-#if 0
if (!(my_info3-acct_flags ACB_NORMAL)) {
- DEBUG(10,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
+ DEBUG(0,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
my_info3-acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-#endif
+
kickoff_time = nt_time_to_unix(my_info3-kickoff_time);
if (kickoff_time != 0 time(NULL) kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
@@ -1242,6 +1239,65 @@
} while ( (attempts 2) retry );
+ /* handle the case where a NT4 DC does not fill in the acct_flags in
+* the samlogon reply info3. When accurate info3 is required by the
+* caller, we look up the account flags ourselve - gd */
+
+ if ((state-request.flags WBFLAG_PAM_INFO3_TEXT)
+ (my_info3-acct_flags == 0) NT_STATUS_IS_OK(result)) {
+
+ struct rpc_pipe_client *samr_pipe;
+ POLICY_HND samr_domain_handle, user_pol;
+ SAM_USERINFO_CTR *user_ctr;
+ NTSTATUS status_tmp;
+ uint32 acct_flags;
+
+ ZERO_STRUCT(user_ctr);
+
+ status_tmp = cm_connect_sam(contact_domain, state-mem_ctx,
+ samr_pipe, samr_domain_handle);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not open handle to SAMR pipe: %s\n,
+ nt_errstr(status_tmp)));
+ goto done;
+ }
+
+ status_tmp = rpccli_samr_open_user(samr_pipe, state-mem_ctx,
+ samr_domain_handle,
+ MAXIMUM_ALLOWED_ACCESS,
+ my_info3-user_rid,
user_pol);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not open user handle on SAMR pipe:
%s\n,
+ nt_errstr(status_tmp)));
+ goto done;
+ }
+
+ status_tmp = rpccli_samr_query_userinfo(samr_pipe,
state-mem_ctx,
+ user_pol, 16,
user_ctr);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not query user info on SAMR pipe:
%s\n,
+
svn commit: samba r21319 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2007-02-13 15:57:54 + (Tue, 13 Feb 2007)
New Revision: 21319
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21319
Log:
Remove functions not needed anymore
Modified:
branches/SAMBA_3_0/source/smbd/files.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/files.c
===
--- branches/SAMBA_3_0/source/smbd/files.c 2007-02-13 15:56:09 UTC (rev
21318)
+++ branches/SAMBA_3_0/source/smbd/files.c 2007-02-13 15:57:54 UTC (rev
21319)
@@ -361,50 +361,6 @@
return NULL;
}
-/*
- * Same as file_find_di_first/next, but also finds non-fd opens.
- *
- * Jeremy, do we really need the fsp-fh-fd != -1 ??
- */
-
-struct files_struct *fsp_find_di_first(SMB_DEV_T dev, SMB_INO_T inode)
-{
- files_struct *fsp;
-
- if (fsp_fi_cache.dev == dev fsp_fi_cache.inode == inode) {
- /* Positive or negative cache hit. */
- return fsp_fi_cache.fsp;
- }
-
- fsp_fi_cache.dev = dev;
- fsp_fi_cache.inode = inode;
-
- for (fsp=Files;fsp;fsp=fsp-next) {
- if ((fsp-dev == dev) (fsp-inode == inode)) {
- /* Setup positive cache. */
- fsp_fi_cache.fsp = fsp;
- return fsp;
- }
- }
-
- /* Setup negative cache. */
- fsp_fi_cache.fsp = NULL;
- return NULL;
-}
-
-struct files_struct *fsp_find_di_next(files_struct *start_fsp)
-{
- files_struct *fsp;
-
- for (fsp = start_fsp-next;fsp;fsp=fsp-next) {
- if ( (fsp-dev == start_fsp-dev)
- (fsp-inode == start_fsp-inode) )
- return fsp;
- }
-
- return NULL;
-}
-
/
Find a fsp that is open for printing.
/
svn commit: samba r21320 - in branches: SAMBA_3_0/source/rpcclient SAMBA_3_0_25/source/rpcclient
Author: gd
Date: 2007-02-13 16:04:36 + (Tue, 13 Feb 2007)
New Revision: 21320
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21320
Log:
Display query_user info level 16 in rpcclient.
Guenther
Modified:
branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_samr.c 2007-02-13 15:57:54 UTC
(rev 21319)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_samr.c 2007-02-13 16:04:36 UTC
(rev 21320)
@@ -47,6 +47,14 @@
}
/
+ display sam_user_info_16 structure
+ /
+static void display_sam_user_info_16(SAM_USER_INFO_16 *usr)
+{
+ printf(\tAcct Flags :\tox%x\n, usr-acb_info);
+}
+
+/
display sam_user_info_21 structure
/
static void display_sam_user_info_21(SAM_USER_INFO_21 *usr)
@@ -411,15 +419,18 @@
goto done;
switch (user_ctr-switch_value) {
- case 21:
- display_sam_user_info_21(user_ctr-info.id21);
- break;
case 7:
display_sam_user_info_7(user_ctr-info.id7);
break;
case 9:
display_sam_user_info_9(user_ctr-info.id9);
break;
+ case 16:
+ display_sam_user_info_16(user_ctr-info.id16);
+ break;
+ case 21:
+ display_sam_user_info_21(user_ctr-info.id21);
+ break;
default:
printf(Unsupported infolevel: %d\n, info_level);
break;
Modified: branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c
===
--- branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c 2007-02-13 15:57:54 UTC
(rev 21319)
+++ branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c 2007-02-13 16:04:36 UTC
(rev 21320)
@@ -47,6 +47,14 @@
}
/
+ display sam_user_info_16 structure
+ /
+static void display_sam_user_info_16(SAM_USER_INFO_16 *usr)
+{
+ printf(\tAcct Flags :\tox%x\n, usr-acb_info);
+}
+
+/
display sam_user_info_21 structure
/
static void display_sam_user_info_21(SAM_USER_INFO_21 *usr)
@@ -411,15 +419,18 @@
goto done;
switch (user_ctr-switch_value) {
- case 21:
- display_sam_user_info_21(user_ctr-info.id21);
- break;
case 7:
display_sam_user_info_7(user_ctr-info.id7);
break;
case 9:
display_sam_user_info_9(user_ctr-info.id9);
break;
+ case 16:
+ display_sam_user_info_16(user_ctr-info.id16);
+ break;
+ case 21:
+ display_sam_user_info_21(user_ctr-info.id21);
+ break;
default:
printf(Unsupported infolevel: %d\n, info_level);
break;
Rev 11424: Fix installation of headers. in file:///home/jelmer/bzr.samba/nogtk/
At file:///home/jelmer/bzr.samba/nogtk/ revno: 11424 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:24:03 +0100 message: Fix installation of headers. modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po svn-v2:[EMAIL PROTECTED] === modified file '.bzrignore' --- a/.bzrignore2007-01-23 01:29:17 + +++ b/.bzrignore2007-02-12 11:24:03 + @@ -162,3 +162,10 @@ source/st source/samba.info source/pidl/cover_db +source/dsdb/repl/drepl_service_proto.h +webapps/qooxdoo-0.6.5-sdk/frontend/framework/.cache +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/locale/data +webapps/swat/source/translation +webapps/swat/source/class/swat/translation +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/locale/translation +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot === modified file 'source/configure.ac' --- a/source/configure.ac 2007-01-15 19:08:03 + +++ b/source/configure.ac 2007-02-12 11:24:03 + @@ -38,7 +38,6 @@ m4_include(smbd/process_model.m4) m4_include(lib/registry/config.m4) m4_include(scripting/swig/config.m4) -m4_include(gtk/config.m4) m4_include(ntvfs/posix/config.m4) m4_include(ntvfs/unixuid/config.m4) m4_include(lib/socket_wrapper/config.m4) === modified file 'source/headermap.txt' --- a/source/headermap.txt 2006-11-07 01:25:17 + +++ b/source/headermap.txt 2007-02-12 11:24:03 + @@ -43,9 +43,17 @@ librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h +librpc/gen_ndr/mgmt.h: dcerpc/mgmt.h +librpc/gen_ndr/ndr_mgmt.h: dcerpc/ndr_mgmt.h +librpc/gen_ndr/ndr_mgmt_c.h: dcerpc/ndr_mgmt_c.h +librpc/gen_ndr/epmapper.h: dcerpc/epmapper.h +librpc/gen_ndr/ndr_epmapper.h: dcerpc/ndr_epmapper.h +librpc/gen_ndr/ndr_epmapper_c.h: dcerpc/ndr_epmapper_c.h librpc/gen_ndr/misc.h: gen_ndr/misc.h librpc/gen_ndr/lsa.h: gen_ndr/lsa.h -librpc/gen_ndr/samr.h: gen_ndr/samr.h +librpc/gen_ndr/samr.h: dcerpc/samr.h +librpc/gen_ndr/ndr_samr.h: dcerpc/ndr_samr.h +librpc/gen_ndr/ndr_samr_c.h: dcerpc/ndr_samr_c.h librpc/gen_ndr/security.h: gen_ndr/security.h librpc/ndr/libndr_proto.h: ndr/proto.h librpc/rpc/dcerpc_proto.h: dcerpc/proto.h @@ -94,3 +102,5 @@ param/share_proto.h: param/share_proto.h lib/util/util_tdb.h: util_tdb.h lib/util/wrap_xattr.h: wrap_xattr.h +lib/events/events.h: events/events.h +lib/events/events_internal.h: events/events_internal.h === modified file 'source/lib/events/config.mk' --- a/source/lib/events/config.mk 2007-01-21 08:23:14 + +++ b/source/lib/events/config.mk 2007-02-12 11:24:03 + @@ -32,6 +32,7 @@ # Start SUBSYSTEM LIBEVENTS [SUBSYSTEM::LIBEVENTS] OBJ_FILES = events.o events_timed.o events_signal.o +PUBLIC_HEADERS = events.h events_internal.h PUBLIC_DEPENDENCIES = LIBTALLOC # End SUBSYSTEM LIBEVENTS ## === modified file 'source/lib/events/events.h' --- a/source/lib/events/events.h2007-01-21 10:32:39 + +++ b/source/lib/events/events.h2007-02-12 11:24:03 + @@ -23,6 +23,9 @@ #ifndef __EVENTS_H__ #define __EVENTS_H__ +#include talloc.h +#include stdlib.h + struct event_context; struct event_ops; struct fd_event; === modified file 'source/librpc/config.mk' --- a/source/librpc/config.mk 2006-12-21 03:39:33 + +++ b/source/librpc/config.mk 2007-02-12 11:24:03 + @@ -110,7 +110,7 @@ [SUBSYSTEM::NDR_SAMR] OBJ_FILES = gen_ndr/ndr_samr.o -PUBLIC_HEADERS = gen_ndr/samr.h +PUBLIC_HEADERS = gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY [SUBSYSTEM::NDR_NFS4ACL] @@ -175,7 +175,7 @@ [SUBSYSTEM::NDR_MGMT] OBJ_FILES = gen_ndr/ndr_mgmt.o -PUBLIC_DEPENDENCIES = LIBNDR NDR_DCERPC +PUBLIC_DEPENDENCIES = LIBNDR [SUBSYSTEM::NDR_PROTECTED_STORAGE] OBJ_FILES = gen_ndr/ndr_protected_storage.o @@ -441,7 +441,9 @@ VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = DCE/RPC client library -PUBLIC_HEADERS = rpc/dcerpc.h +PUBLIC_HEADERS = rpc/dcerpc.h \ + gen_ndr/mgmt.h gen_ndr/ndr_mgmt.h gen_ndr/ndr_mgmt_c.h \ + gen_ndr/epmapper.h gen_ndr/ndr_epmapper.h gen_ndr/ndr_epmapper_c.h PUBLIC_PROTO_HEADER = rpc/dcerpc_proto.h OBJ_FILES = \ rpc/dcerpc.o \ @@ -455,8 +457,7 @@ rpc/dcerpc_connect.o PRIVATE_DEPENDENCIES = \
Rev 11169: Merge upstream. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/ revno: 11169 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: 4.0-regwrite timestamp: Mon 2007-02-12 22:07:46 +0100 message: Merge upstream. removed: source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] added: webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/AbstractResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/DefaultResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeBehaviorColumnData.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeTableColumnModel.js svn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/dsdb/repl/replicated_objects.c svn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.csvn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.hsvn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump_keytab.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samsync_ldb.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/librpc/idl/netlogon.idl svn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED] source/setup/provision_init.ldif svn-v2:[EMAIL PROTECTED] source/torture/basic/misc.csvn-v2:[EMAIL PROTECTED] source/torture/libnet/libnet_BecomeDC.c svn-v2:[EMAIL PROTECTED] source/torture/rpc/dssync.csvn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/Table.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/util/fsm/FiniteStateMachine.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/main/AbstractModule.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/main/AbstractModuleFsm.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/Gui.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js svn-v2:[EMAIL PROTECTED]
Rev 11434: Provide simple redirecting headers for standard headers. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11434 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 18:30:50 +0100 message: Provide simple redirecting headers for standard headers. modified: source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] === modified file 'source/lib/replace/README' --- a/source/lib/replace/README 2006-10-16 21:39:07 + +++ b/source/lib/replace/README 2007-02-12 17:30:50 + @@ -81,6 +81,10 @@ MAX QSORT_CAST +Headers: +stdint.h +stdbool.h + Prerequisites: memset (for bzero) syslog (for vsyslog) === modified file 'source/lib/replace/libreplace.m4' --- a/source/lib/replace/libreplace.m4 2007-01-15 19:08:03 + +++ b/source/lib/replace/libreplace.m4 2007-02-12 17:30:50 + @@ -61,9 +61,12 @@ AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp) -AC_CHECK_HEADERS(stdbool.h sys/select.h) +AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h) AC_CHECK_HEADERS(setjmp.h) +LIBREPLACE_PROVIDE_HEADER([stdint.h]) +LIBREPLACE_PROVIDE_HEADER([stdbool.h]) + AC_CHECK_TYPE(bool, [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],, [ === modified file 'source/lib/replace/libreplace_macros.m4' --- a/source/lib/replace/libreplace_macros.m4 2006-10-11 13:36:37 + +++ b/source/lib/replace/libreplace_macros.m4 2007-02-12 17:30:50 + @@ -306,3 +306,12 @@ ) AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4]) ]) + +AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, +[AC_CHECK_HEADER([$1], + [ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], [libreplacedir=$libreplacedir]) ], + [ AC_CONFIG_COMMANDS(mk-$1, [echo #include \replace.h\ $libreplacedir/$1], [libreplacedir=$libreplacedir]) ] + ) +]) + +
Rev 11170: Fix more build issues. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/
revno: 11170
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-regwrite
timestamp: Tue 2007-02-13 00:53:54 +0100
message:
Fix more build issues.
removed:
source/gtk/svn-v2:[EMAIL PROTECTED]
source/gtk/tools/ svn-v2:[EMAIL PROTECTED]
modified:
source/lib/registry/dir.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/regf.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/rpc.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tests/generic.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
=== removed directory 'source/gtk'
=== removed directory 'source/gtk/tools'
=== modified file 'source/lib/registry/dir.c'
--- a/source/lib/registry/dir.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/dir.c 2007-02-12 23:53:54 +
@@ -123,7 +123,7 @@
{
if(!location) return WERR_INVALID_PARAM;
- *key = talloc(h, struct registry_key);
+ *key = talloc(parent_ctx, struct registry_key);
(*key)-backend_data = talloc_strdup(*key, location);
return WERR_OK;
}
=== modified file 'source/lib/registry/regf.c'
--- a/source/lib/registry/regf.c2007-02-08 17:18:35 +
+++ b/source/lib/registry/regf.c2007-02-12 23:53:54 +
@@ -1692,7 +1692,7 @@
return WERR_OK;
}
-static struct hive_operations reg_backend_regf = {
+static struct reg_key_operations reg_backend_regf = {
.name = regf,
.num_subkeys = regf_num_subkeys,
.num_values = regf_num_values,
=== modified file 'source/lib/registry/rpc.c'
--- a/source/lib/registry/rpc.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/rpc.c 2007-02-12 23:53:54 +
@@ -21,7 +21,7 @@
#include registry.h
#include librpc/gen_ndr/ndr_winreg_c.h
-static struct hive_operations reg_backend_rpc;
+static struct reg_key_operations reg_backend_rpc;
/**
* This is the RPC backend for the registry library.
=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tests/generic.c 2007-02-12 23:53:54 +
@@ -46,11 +46,6 @@
const struct test_backend_settings *backend = test_data;
TALLOC_CTX *mem_ctx = tctx;
- if (!reg_has_backend(backend-name)) {
- torture_skip(tctx, talloc_asprintf(tctx,
- Backend '%s' support not
compiled in, backend-name));
- }
-
error = reg_open_hive(mem_ctx, backend-name,
backend-location, NULL,
cmdline_credentials, root);
torture_assert_werr_ok(tctx, error, reg_open_hive());
=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regdiff.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include includes.h
#include lib/registry/registry.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include lib/cmdline/popt_common.h
int main(int argc, const char **argv)
=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regpatch.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include lib/events/events.h
#include lib/registry/registry.h
#include lib/cmdline/popt_common.h
-#include lib/registry/reg_backend_rpc.h
int main(int argc, char **argv)
{
=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regshell.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include lib/registry/registry.h
#include lib/cmdline/popt_common.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include system/time.h
#include lib/smbreadline/smbreadline.h
#include librpc/gen_ndr/ndr_security.h
=== modified file 'source/lib/registry/tools/regtree.c'
--- a/source/lib/registry/tools/regtree.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regtree.c 2007-02-12 23:53:54 +
@@ -22,7 +22,6 @@
#include includes.h
#include lib/registry/registry.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include lib/cmdline/popt_common.h
static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
Rev 11391: Merge from upstream. in file:///home/jelmer/bzr.samba/4.0-movetests/
At file:///home/jelmer/bzr.samba/4.0-movetests/ revno: 11391 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: 4.0-movetests timestamp: Mon 2007-02-12 22:23:05 +0100 message: Merge from upstream. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] added: webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/AbstractResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/DefaultResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeBehaviorColumnData.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeTableColumnModel.js svn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/cluster/cluster.c svn-v2:[EMAIL PROTECTED] source/cluster/cluster.h svn-v2:[EMAIL PROTECTED] source/cluster/cluster_private.h svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/common/ctdb.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/common/ctdb_message.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/ctdb_cluster.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/include/ctdb.h svn-v2:[EMAIL PROTECTED] source/cluster/local.c svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/dsdb/repl/replicated_objects.c svn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/messaging/messaging.c svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.csvn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.hsvn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump_keytab.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samsync_ldb.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/librpc/idl/netlogon.idl svn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] source/pidl/tests/header.plsvn-v2:[EMAIL PROTECTED] source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED] source/setup/provision_init.ldif svn-v2:[EMAIL PROTECTED] source/torture/basic/misc.csvn-v2:[EMAIL PROTECTED] source/torture/libnet/libnet_BecomeDC.c svn-v2:[EMAIL PROTECTED] source/torture/rpc/dssync.csvn-v2:[EMAIL PROTECTED]
Rev 11168: More work getting the build working again. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/
revno: 11168
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-regwrite
timestamp: Mon 2007-02-12 22:00:15 +0100
message:
More work getting the build working again.
modified:
source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED]
source/lib/registry/interface.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/ldb.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tests/generic.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
source/smbd/server.c svn-v2:[EMAIL PROTECTED]
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po
svn-v2:[EMAIL PROTECTED]
=== modified file 'source/gtk/tools/gregedit.c'
--- a/source/gtk/tools/gregedit.c 2006-09-16 16:59:37 +
+++ b/source/gtk/tools/gregedit.c 2007-02-12 21:00:15 +
@@ -972,8 +972,6 @@
mem_ctx = talloc_init(gregedit);
- registry_init();
-
gtk_init(argc, argv);
mainwin = create_mainwindow();
gtk_widget_show_all(mainwin);
=== modified file 'source/lib/registry/interface.c'
--- a/source/lib/registry/interface.c 2007-02-08 17:18:35 +
+++ b/source/lib/registry/interface.c 2007-02-12 21:00:15 +
@@ -101,16 +101,12 @@
struct
cli_credentials *credentials,
struct registry_key
**root)
{
- struct registry_hive *rethive;
- struct registry_key *retkey = NULL;
- struct reg_init_function_entry *entry;
- WERROR werr;
int fd, num;
char peek[20];
/* Check for directory */
if (directory_exist(location)) {
- return reg_open_directory(location, root);
+ return reg_open_directory(parent_ctx, location, root);
}
fd = open(location, O_RDWR);
@@ -125,13 +121,13 @@
if (!strncmp(peek, CREG, 4)) {
close(fd);
- return reg_open_creg_file(location, root);
+ return reg_open_creg_file(parent_ctx, location, root);
} else if (!strncmp(peek, REGF, 4)) {
close(fd);
- return reg_open_regf_file(location, root);
+ return reg_open_regf_file(parent_ctx, location, root);
} else if (!strncmp(peek, TDB file, 8)) {
close(fd);
- return reg_open_ldb_file(location, session_info, credentials,
root);
+ return reg_open_ldb_file(parent_ctx, location, session_info,
credentials, root);
}
return WERR_BADFILE;
=== modified file 'source/lib/registry/ldb.c'
--- a/source/lib/registry/ldb.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/ldb.c 2007-02-12 21:00:15 +
@@ -261,7 +261,7 @@
return WERR_OK;
}
-WERROR reg_open_ldb_file(const char *location,
+WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
struct
auth_session_info *session_info,
struct
cli_credentials *credentials,
struct
registry_key **k)
@@ -272,7 +272,7 @@
if (!location)
return WERR_INVALID_PARAM;
- wrap = ldb_wrap_connect(hive, location, session_info, credentials, 0,
NULL);
+ wrap = ldb_wrap_connect(parent_ctx, location, session_info,
credentials, 0, NULL);
if(!wrap) {
DEBUG(1, (__FILE__: unable to connect\n));
@@ -282,7 +282,7 @@
ldb_set_debug_stderr(wrap);
hive-backend_data = wrap;
- *k = talloc_zero(hive, struct registry_key);
+ *k = talloc_zero(parent_ctx, struct registry_key);
talloc_set_destructor (*k, reg_close_ldb_key);
talloc_set_destructor (hive, ldb_free_hive);
(*k)-name = talloc_strdup(*k, );
=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c 2007-02-08 15:59:04 +
+++ b/source/lib/registry/tests/generic.c 2007-02-12 21:00:15 +
@@ -151,8 +151,6 @@
REGISTRY);
int i;
- registry_init();
-
torture_suite_add_simple_test(suite, str_regtype, test_str_regtype);
torture_suite_add_simple_test(suite, reg_val_data_string dword,
test_reg_val_data_string_dword);
torture_suite_add_simple_test(suite, reg_val_data_string sz,
test_reg_val_data_string_sz);
=== modified file
Rev 11429: Remove the GTK+ tools and library from the main repository. They are now maintained separately in bzr at http://people.samba.org/bzr/jelmer/samba-gtk in file:///home/jelmer/bzr.samba/SAMBA_
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11429 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 13:05:16 +0100 message: Remove the GTK+ tools and library from the main repository. They are now maintained separately in bzr at http://people.samba.org/bzr/jelmer/samba-gtk This also adds some more headers to the list that is installed and a couple of extra #include lines so these headers can be used externally without problems. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po svn-v2:[EMAIL PROTECTED] revno: 11422.1.3 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:54:14 +0100 message: Install more headers. revno: 11422.1.2 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:24:03 +0100 message: Fix installation of headers. revno: 11422.1.1 merged: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 02:32:36 +0100 message: Remove GTK+ tools from the tree. Diff too large for email (5250 lines, the limit is 1000).
Rev 11423: Remove GTK+ tools from the tree. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11423 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 02:32:36 +0100 message: Remove GTK+ tools from the tree. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] modified: source/main.mk svn-v2:[EMAIL PROTECTED] Diff too large for email (4600 lines, the limit is 1000).
Rev 11425: Install more headers. in file:///home/jelmer/bzr.samba/nogtk/
At file:///home/jelmer/bzr.samba/nogtk/ revno: 11425 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:54:14 +0100 message: Install more headers. modified: source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] === modified file 'source/headermap.txt' --- a/source/headermap.txt 2007-02-12 11:24:03 + +++ b/source/headermap.txt 2007-02-12 11:54:14 + @@ -33,6 +33,8 @@ gtk/common/select.h: gtk/select.h librpc/ndr/libndr.h: ndr.h lib/registry/registry.h: registry.h +lib/registry/reg_backend_rpc.h: registry_rpc.h +lib/registry/registry_proto.h: registry/proto.h libcli/util/nterr.h: core/nterr.h libcli/util/doserr.h: core/doserr.h libcli/util/nt_status.h: core/ntstatus.h @@ -49,6 +51,9 @@ librpc/gen_ndr/epmapper.h: dcerpc/epmapper.h librpc/gen_ndr/ndr_epmapper.h: dcerpc/ndr_epmapper.h librpc/gen_ndr/ndr_epmapper_c.h: dcerpc/ndr_epmapper_c.h +librpc/gen_ndr/ndr_atsvc.h: dcerpc/ndr_atsvc.h +librpc/gen_ndr/atsvc.h: dcerpc/atsvc.h +librpc/gen_ndr/ndr_atsvc_c.h: dcerpc/ndr_atsvc_c.h librpc/gen_ndr/misc.h: gen_ndr/misc.h librpc/gen_ndr/lsa.h: gen_ndr/lsa.h librpc/gen_ndr/samr.h: dcerpc/samr.h @@ -81,7 +86,9 @@ libcli/libcli.h: client.h libcli/libcli_proto.h: client/proto.h librpc/gen_ndr/nbt.h: gen_ndr/nbt.h -librpc/gen_ndr/svcctl.h: gen_ndr/nbt.h +librpc/gen_ndr/svcctl.h: dcerpc/svcctl.h +librpc/gen_ndr/ndr_svcctl.h: dcerpc/ndr_svcctl.h +librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h lib/cmdline/popt_common.h: samba/popt.h lib/util/dlinklist.h: dlinklist.h version.h: samba/version.h === modified file 'source/include/core.h' --- a/source/include/core.h 2007-01-10 11:50:33 + +++ b/source/include/core.h 2007-02-12 11:54:14 + @@ -26,6 +26,8 @@ #include libcli/util/nt_status.h +#include stdbool.h +#include stdlib.h typedef bool BOOL; #define False false === modified file 'source/lib/registry/config.mk' --- a/source/lib/registry/config.mk 2006-09-07 10:02:32 + +++ b/source/lib/registry/config.mk 2007-02-12 11:54:14 + @@ -52,7 +52,7 @@ # Start MODULE registry_rpc [MODULE::registry_rpc] INIT_FUNCTION = registry_rpc_init -PRIVATE_PROTO_HEADER = reg_backend_rpc.h +PUBLIC_PROTO_HEADER = reg_backend_rpc.h OUTPUT_TYPE = INTEGRATED SUBSYSTEM = registry OBJ_FILES = \ @@ -99,7 +99,7 @@ patchfile.o PUBLIC_DEPENDENCIES = \ LIBSAMBA-UTIL CHARSET -PRIVATE_PROTO_HEADER = registry_proto.h +PUBLIC_PROTO_HEADER = registry_proto.h PUBLIC_HEADERS = registry.h # End MODULE registry_ldb === modified file 'source/lib/registry/registry.h' --- a/source/lib/registry/registry.h2006-11-07 00:48:36 + +++ b/source/lib/registry/registry.h2007-02-12 11:54:14 + @@ -22,6 +22,8 @@ #ifndef _REGISTRY_H /* _REGISTRY_H */ #define _REGISTRY_H +#include core.h +#include talloc.h #include librpc/gen_ndr/security.h /* Handles for the predefined keys */ === modified file 'source/lib/talloc/talloc.h' --- a/source/lib/talloc/talloc.h2006-12-15 22:45:36 + +++ b/source/lib/talloc/talloc.h2007-02-12 11:54:14 + @@ -26,6 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include stdlib.h +#include stdio.h +#include stdarg.h + /* this is only needed for compatibility with the old talloc */ typedef void TALLOC_CTX; === modified file 'source/libcli/util/nt_status.h' --- a/source/libcli/util/nt_status.h2006-03-17 01:36:32 + +++ b/source/libcli/util/nt_status.h2007-02-12 11:54:14 + @@ -22,6 +22,8 @@ #ifndef _NT_STATUS_H #define _NT_STATUS_H +#include stdint.h + /* the following rather strange looking definitions of NTSTATUS and WERROR and there in order to catch common coding errors where different error types are mixed up. This is especially important as we slowly convert Samba === modified file 'source/librpc/config.mk' --- a/source/librpc/config.mk 2007-02-12 11:24:03 + +++ b/source/librpc/config.mk 2007-02-12 11:54:14 + @@ -135,10 +135,12 @@ [SUBSYSTEM::NDR_SVCCTL] OBJ_FILES = gen_ndr/ndr_svcctl.o +PUBLIC_HEADERS = gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC [SUBSYSTEM::NDR_ATSVC] OBJ_FILES = gen_ndr/ndr_atsvc.o +PUBLIC_HEADERS = gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h PUBLIC_DEPENDENCIES = LIBNDR [SUBSYSTEM::NDR_EVENTLOG] @@ -344,10 +346,12 @@
Rev 11326: Remove samba-gtk bits, add bzr-builddeb. in file:///home/jelmer/bzr.samba/4.0-debian/
At file:///home/jelmer/bzr.samba/4.0-debian/
revno: 11326
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-debian
timestamp: Tue 2007-02-13 00:30:59 +0100
message:
Remove samba-gtk bits, add bzr-builddeb.
removed:
debian/libgtksamba-dev.install svn-v2:[EMAIL PROTECTED]
debian/libgtksamba0.installsvn-v2:[EMAIL PROTECTED]
debian/samba-gtk-frontends.install svn-v2:[EMAIL PROTECTED]
modified:
.bzr-builddeb/default.conf default.conf-20070127221815-iop0s8809kcw71wm-1
.bzrignore svn-v2:[EMAIL PROTECTED]
debian/changelog svn-v2:[EMAIL PROTECTED]
debian/control svn-v2:[EMAIL PROTECTED]
debian/rules svn-v2:[EMAIL PROTECTED]
source/main.mk svn-v2:[EMAIL PROTECTED]
=== removed file 'debian/libgtksamba-dev.install'
--- a/debian/libgtksamba-dev.install2007-01-27 22:11:08 +
+++ b/debian/libgtksamba-dev.install1970-01-01 00:00:00 +
@@ -1,4 +0,0 @@
-usr/include/samba-4.0/gtk-smb.h
-usr/include/samba-4.0/gtk/*.h
-usr/lib/pkgconfig/gtksamba.pc
-usr/lib/libgtksamba.so
=== removed file 'debian/libgtksamba0.install'
--- a/debian/libgtksamba0.install 2007-01-27 22:11:08 +
+++ b/debian/libgtksamba0.install 1970-01-01 00:00:00 +
@@ -1,1 +0,0 @@
-usr/lib/libgtksamba.so.0.*
=== removed file 'debian/samba-gtk-frontends.install'
--- a/debian/samba-gtk-frontends.install2007-01-27 22:11:08 +
+++ b/debian/samba-gtk-frontends.install1970-01-01 00:00:00 +
@@ -1,6 +0,0 @@
-usr/bin/gregedit
-usr/bin/gepdump
-usr/bin/gwcrontab
-usr/share/man/man1/gregedit.1
-usr/share/man/man1/gepdump.1
-usr/share/man/man1/gwcrontab.1
=== modified file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf2007-01-27 22:51:26 +
+++ b/.bzr-builddeb/default.conf2007-02-12 23:30:59 +
@@ -1,3 +1,2 @@
[BUILDDEB]
merge = True
-export-upstream = svn://svn.samba.org/samba/branches/SAMBA_4_0_RELEASE
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-23 01:29:17 +
+++ b/.bzrignore2007-02-12 23:30:59 +
@@ -162,3 +162,26 @@
source/st
source/samba.info
source/pidl/cover_db
+debian/ldb-tools
+debian/libgensec-dev
+debian/libgensec0
+debian/libldb-dev
+debian/libldb0
+debian/libparse-pidl-perl
+debian/libsamba-dev
+debian/libsamba0
+debian/libtalloc-dev
+debian/libtalloc0
+debian/libtdb-dev
+debian/libtdb0
+debian/samba
+debian/samba-clients
+debian/samba-common
+debian/samba-dev
+debian/samba-testsuite
+debian/swat
+debian/tmp
+debian/winregistry-tools
+source/dsdb/repl/drepl_service_proto.h
+build-stamp
+configure-stamp
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-01-27 22:11:08 +
+++ b/debian/changelog 2007-02-12 23:30:59 +
@@ -1,4 +1,4 @@
-samba (4.0.0~~svn19515-1) UNRELEASED; urgency=low
+samba (4.0.0tp4-1) UNRELEASED; urgency=low
* New upstream versions (svn snapshots of r19515).
=== modified file 'debian/control'
--- a/debian/control2007-01-27 22:11:08 +
+++ b/debian/control2007-02-12 23:30:59 +
@@ -4,7 +4,7 @@
Maintainer: Jelmer Vernooij [EMAIL PROTECTED]
Uploaders: Steve Langasek [EMAIL PROTECTED], Christian Perrier [EMAIL
PROTECTED], Noèl Köthe [EMAIL PROTECTED], Steinar H. Gunderson [EMAIL
PROTECTED]
Standards-Version: 3.6.2
-Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper ( 5.0.0),
libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf,
libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev,
flex, bison
+Build-Depends: debhelper ( 5.0.0), libparse-yapp-perl, perl, docbook-xsl,
docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev,
libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison
Package: samba
Architecture: any
@@ -81,27 +81,6 @@
This package contains programs for testing the reliability and speed
of SMB servers, Samba in particular.
-Package: samba-gtk-frontends
-Architecture: any
-Depends: ${shlibs:Depends}
-Section: x11
-Description: graphical Samba client utilities
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients, as well as
- run as a domain controller for Active Directory.
- .
- These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. These should be considered _experimental_, and should
- not be used in production. In particular, no guarantees are made with
- regard to upgrades between versions.
- .
- This package contains GTK+ programs for maintaining:
- .
- * Remote SAM databases
- * Local and remote registries
- * DCE/RPC endpoints
-
Package: winregistry-tools
Architecture: any
Depends: ${shlibs:Depends}
@@ -250,22 +229,6 @@
.
This package contains the files
Rev 11431: Fix the build for those that don't have talloc.h installed. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11431 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 14:00:37 +0100 message: Fix the build for those that don't have talloc.h installed. modified: source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] === modified file 'source/lib/events/events.h' --- a/source/lib/events/events.h2007-02-12 12:12:12 + +++ b/source/lib/events/events.h2007-02-12 13:00:37 + @@ -23,7 +23,7 @@ #ifndef __EVENTS_H__ #define __EVENTS_H__ -#include talloc.h +#include talloc/talloc.h #include stdlib.h struct event_context; === modified file 'source/lib/registry/registry.h' --- a/source/lib/registry/registry.h2007-02-12 12:12:12 + +++ b/source/lib/registry/registry.h2007-02-12 13:00:37 + @@ -23,7 +23,7 @@ #define _REGISTRY_H #include core.h -#include talloc.h +#include talloc/talloc.h #include librpc/gen_ndr/security.h /* Handles for the predefined keys */
svn commit: samba r21321 - in branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual: .
Author: derrell
Date: 2007-02-13 20:35:48 + (Tue, 13 Feb 2007)
New Revision: 21321
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21321
Log:
- Allow pruning all of the children of a node without removing the node
itself.
- By default, create only one meta column if only the tree is displayed. If
additional columns are displayed, then put all of them in a separate meta
column, and the tree in the first meta column by itself.
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-13 16:04:36 UTC (rev 21320)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-13 20:35:48 UTC (rev 21321)
@@ -405,35 +405,42 @@
/**
- * Prune the tree by removing the specified node, and, if the node has
- * children, recursively all of its children.
+ * Prune the tree by removing, recursively, all of a node's children. If
+ * requested, also remove the node itself.
*
* @param nodeId {Integer}
* The node id, previously returned by [EMAIL PROTECTED] #addLeaf} or [EMAIL
PROTECTED]
* #addBranch}, of the node (and its children) to be pruned from the tree.
+ *
+ * @param bSelfAlso {Boolean}
+ * If itrue/i then remove the node identified by inodeId/i as well
+ * as all of the children.
*/
-qx.Proto.prune = function(nodeId)
+qx.Proto.prune = function(nodeId, bSelfAlso)
{
// First, recursively remove all children
for (var i = 0; i this._nodeArr[nodeId].children.length; i++)
{
-this.prune(this._nodeArr[nodeId].children[i]);
+this.prune(this._nodeArr[nodeId].children[i], true);
}
- // Delete ourself from our parent's children list
- var node = this._nodeArr[nodeId];
- qx.lang.Array.remove(this._nodeArr[node.parentNodeId].children, nodeId);
+ if (bSelfAlso)
+ {
+// Delete ourself from our parent's children list
+var node = this._nodeArr[nodeId];
+qx.lang.Array.remove(this._nodeArr[node.parentNodeId].children, nodeId);
- // Delete ourself from the selections list, if we're in it.
- if (this._selections[nodeId])
- {
-delete this._selections[nodeId];
+// Delete ourself from the selections list, if we're in it.
+if (this._selections[nodeId])
+{
+ delete this._selections[nodeId];
+}
+
+// We can't splice the node itself out, because that would muck up the
+// nodeId == index correspondence. Instead, just replace the node with
+// null so its index just becomes unused.
+this._nodeArr[nodeId] = null;
}
-
- // We can't splice the node itself out, because that would muck up the
- // nodeId == index correspondence. Instead, just replace the node with
- // null so its index just becomes unused.
- this._nodeArr[nodeId] = null;
};
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
2007-02-13 16:04:36 UTC (rev 21320)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
2007-02-13 20:35:48 UTC (rev 21321)
@@ -71,7 +71,7 @@
// Set sizes
this.setRowHeight(16);
- this.setMetaColumnCounts([1, -1]);
+ this.setMetaColumnCounts(headings.length 1 ? [ 1, -1 ] : [ 1 ]);
// Set the data cell render. We use the SimpleTreeDataCellRenderer for the
// tree column, and our DefaultDataCellRenderer for all other columns.
svn commit: samba r21322 - in branches/SAMBA_3_0_25/source: . include lib librpc/gen_ndr libsmb nmbd nsswitch param printing rpc_server smbd torture utils
Author: vlendec Date: 2007-02-13 20:55:17 + (Tue, 13 Feb 2007) New Revision: 21322 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21322 Log: No feedback means consent :-) It does not matter if I screw up 3.0.25 or 3.0.26 with this, so do it rather sooner than later. Add the notify support that already exists in 3_0 to 3_0_25. If you want to see this patch dissected into digestable parts, look at 3_0, revisions at about 20800 and following. Volker Added: branches/SAMBA_3_0_25/source/librpc/gen_ndr/ndr_notify.c branches/SAMBA_3_0_25/source/librpc/gen_ndr/ndr_notify.h branches/SAMBA_3_0_25/source/librpc/gen_ndr/notify.h branches/SAMBA_3_0_25/source/smbd/notify_inotify.c branches/SAMBA_3_0_25/source/smbd/notify_internal.c Removed: branches/SAMBA_3_0_25/source/smbd/notify_fam.c branches/SAMBA_3_0_25/source/smbd/notify_hash.c branches/SAMBA_3_0_25/source/smbd/notify_kernel.c Modified: branches/SAMBA_3_0_25/source/Makefile.in branches/SAMBA_3_0_25/source/configure.in branches/SAMBA_3_0_25/source/include/event.h branches/SAMBA_3_0_25/source/include/includes.h branches/SAMBA_3_0_25/source/include/messages.h branches/SAMBA_3_0_25/source/include/nt_status.h branches/SAMBA_3_0_25/source/include/smb.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/lib/debug.c branches/SAMBA_3_0_25/source/lib/dmallocmsg.c branches/SAMBA_3_0_25/source/lib/events.c branches/SAMBA_3_0_25/source/lib/messages.c branches/SAMBA_3_0_25/source/lib/tallocmsg.c branches/SAMBA_3_0_25/source/lib/util.c branches/SAMBA_3_0_25/source/lib/util_tdb.c branches/SAMBA_3_0_25/source/libsmb/clidgram.c branches/SAMBA_3_0_25/source/nmbd/nmbd.c branches/SAMBA_3_0_25/source/nmbd/nmbd_elections.c branches/SAMBA_3_0_25/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0_25/source/nsswitch/winbindd.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_25/source/param/loadparm.c branches/SAMBA_3_0_25/source/printing/nt_printing.c branches/SAMBA_3_0_25/source/printing/printing.c branches/SAMBA_3_0_25/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0_25/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_25/source/smbd/blocking.c branches/SAMBA_3_0_25/source/smbd/close.c branches/SAMBA_3_0_25/source/smbd/conn.c branches/SAMBA_3_0_25/source/smbd/dosmode.c branches/SAMBA_3_0_25/source/smbd/files.c branches/SAMBA_3_0_25/source/smbd/notify.c branches/SAMBA_3_0_25/source/smbd/nttrans.c branches/SAMBA_3_0_25/source/smbd/open.c branches/SAMBA_3_0_25/source/smbd/oplock.c branches/SAMBA_3_0_25/source/smbd/process.c branches/SAMBA_3_0_25/source/smbd/reply.c branches/SAMBA_3_0_25/source/smbd/server.c branches/SAMBA_3_0_25/source/smbd/service.c branches/SAMBA_3_0_25/source/smbd/trans2.c branches/SAMBA_3_0_25/source/smbd/vfs.c branches/SAMBA_3_0_25/source/torture/msgtest.c branches/SAMBA_3_0_25/source/torture/vfstest.c branches/SAMBA_3_0_25/source/utils/net_ads.c branches/SAMBA_3_0_25/source/utils/smbcontrol.c Changeset: Sorry, the patch is too large (6502 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21322
svn commit: samba r21323 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2007-02-13 22:13:59 + (Tue, 13 Feb 2007)
New Revision: 21323
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21323
Log:
add a start to parse the supplementalCredentials value,
it doesn't work yet but it's a start
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-02-13 20:55:17 UTC
(rev 21322)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-02-13 22:13:59 UTC
(rev 21323)
@@ -202,6 +202,31 @@
);
typedef [public] struct {
+ uint16 name_len;
+ uint16 data_len;
+ uint16 id;
+ [charset(UTF16)] uint8 name[name_len];
+ uint8 data[data_len];
+ } supplementalCredentialsPackage;
+
+ typedef [public] struct {
+ uint32 unknown1;
+ [charset(UTF16)] uint16 unknown2[0x30];
+ uint16 unknown3;
+ uint16 num_packages;
+ supplementalCredentialsPackage packages[num_packages];
+ } supplementalCredentialsSubBlob;
+
+ typedef [public] struct {
+ [value(0)] uint32 version;
+ [subcontext(4)] supplementalCredentialsSubBlob sub;
+ } supplementalCredentialsBlob;
+
+ void decode_supplementalCredentials(
+ [in] supplementalCredentialsBlob blob
+ );
+
+ typedef [public] struct {
uint32 marker;
DATA_BLOB data;
} DsCompressedChunk;
Build status as of Wed Feb 14 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-02-13 00:00:44.0 + +++ /home/build/master/cache/broken_results.txt 2007-02-14 00:00:23.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Feb 13 00:00:02 2007 +Build status as of Wed Feb 14 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -6,17 +6,17 @@ build_farm 0 0 0 ccache 31 6 0 ctdb 0 0 0 -distcc 2 0 0 -ldb 30 3 0 -libreplace 28 2 0 -lorikeet-heimdal 27 15 0 -ppp 15 0 0 -rsync31 5 0 +distcc 3 0 0 +ldb 29 3 0 +libreplace 27 2 0 +lorikeet-heimdal 26 15 0 +ppp 14 0 0 +rsync30 5 0 samba0 0 0 samba-docs 0 0 0 -samba4 35 31 0 -samba_3_037 13 0 -smb-build29 28 0 -talloc 31 0 0 -tdb 30 2 0 +samba4 35 27 0 +samba_3_037 12 1 +smb-build28 28 0 +talloc 30 0 0 +tdb 29 2 0
svn commit: samba r21324 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/modules SAMBA_3_0/source/profile SAMBA_3_0/source/smbd SAMBA_3_0_25/source/include SAMBA_3_0_25/source/modules SAMBA_3
Author: jmcd Date: 2007-02-14 02:37:14 + (Wed, 14 Feb 2007) New Revision: 21324 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21324 Log: Add linux setlease to the vfs layer. Next round, as Volker points out, it should be abstracted a little higher up so other os'es can have an entry, but it will take a bit more work. Thanks to Chetan Shringarpure and Mathias Dietz. I didn't increment the vfs number again because the kernel change notify stuff hasn't been released yet anyway. Modified: branches/SAMBA_3_0/source/include/smbprofile.h branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0/source/include/vfs_macros.h branches/SAMBA_3_0/source/modules/vfs_default.c branches/SAMBA_3_0/source/modules/vfs_full_audit.c branches/SAMBA_3_0/source/modules/vfs_gpfs.c branches/SAMBA_3_0/source/profile/profile.c branches/SAMBA_3_0/source/smbd/oplock_linux.c branches/SAMBA_3_0_25/source/include/smbprofile.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/modules/vfs_gpfs.c branches/SAMBA_3_0_25/source/profile/profile.c branches/SAMBA_3_0_25/source/smbd/oplock_linux.c Changeset: Sorry, the patch is too large (609 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21324
svn commit: samba r21325 - in branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual: .
Author: derrell
Date: 2007-02-14 04:13:46 + (Wed, 14 Feb 2007)
New Revision: 21325
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21325
Log:
delete children in reverse order since the array is manipulated during the
recursive delete
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-14 02:37:14 UTC (rev 21324)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-14 04:13:46 UTC (rev 21325)
@@ -419,7 +419,7 @@
qx.Proto.prune = function(nodeId, bSelfAlso)
{
// First, recursively remove all children
- for (var i = 0; i this._nodeArr[nodeId].children.length; i++)
+ for (var i = this._nodeArr[nodeId].children.length - 1; i = 0; i--)
{
this.prune(this._nodeArr[nodeId].children[i], true);
}
svn commit: samba r21326 - in branches/SAMBA_4_0/webapps: .
Author: derrell Date: 2007-02-14 04:19:13 + (Wed, 14 Feb 2007) New Revision: 21326 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21326 Log: get rid of old qooxdoo version. Removed: branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/ Changeset:
svn commit: samba r21327 - in branches/SAMBA_3_0_25/source/modules: .
Author: vlendec
Date: 2007-02-14 04:47:15 + (Wed, 14 Feb 2007)
New Revision: 21327
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21327
Log:
Jim, thanks for the review! :-)
Now to test this...
Volker
Modified:
branches/SAMBA_3_0_25/source/modules/vfs_default.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/modules/vfs_default.c
===
--- branches/SAMBA_3_0_25/source/modules/vfs_default.c 2007-02-14 04:19:13 UTC
(rev 21326)
+++ branches/SAMBA_3_0_25/source/modules/vfs_default.c 2007-02-14 04:47:15 UTC
(rev 21327)
@@ -850,6 +850,33 @@
return result;
}
+static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle,
+struct sys_notify_context *ctx,
+struct notify_entry *e,
+void (*callback)(struct sys_notify_context
*ctx,
+ void *private_data,
+ struct notify_event *ev),
+void *private_data, void *handle)
+{
+ /*
+* So far inotify is the only supported default notify mechanism. If
+* another platform like the the BSD's or a proprietary Unix comes
+* along and wants another default, we can play the same trick we
+* played with Posix ACLs.
+*
+* Until that is the case, hard-code inotify here.
+*/
+#ifdef HAVE_INOTIFY
+ if (lp_kernel_change_notify(ctx-conn-params)) {
+ return inotify_watch(ctx, e, callback, private_data, handle);
+ }
+#endif
+ /*
+* Do nothing, leave everything to notify_internal.c
+*/
+ return NT_STATUS_OK;
+}
+
static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct
*fsp, int fd, uint32 security_info, SEC_DESC **ppdesc)
{
size_t result;
@@ -1231,6 +1258,8 @@
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(vfswrap_realpath), SMB_VFS_OP_REALPATH,
SMB_VFS_LAYER_OPAQUE},
+ {SMB_VFS_OP(vfswrap_notify_watch), SMB_VFS_OP_NOTIFY_WATCH,
+SMB_VFS_LAYER_OPAQUE},
/* NT ACL operations. */
svn commit: samba r21328 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse: .
Author: idra
Date: 2007-02-14 05:16:05 + (Wed, 14 Feb 2007)
New Revision: 21328
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21328
Log:
Ok, now we can successfully modify the ldb and refresh the tree
but ...
- we have a problem with removeAll() in ldbmodify
- we seem to not properly cactch errors, we always return a success
alert even if the operation is not successful :(
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
===
--- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
2007-02-14 04:47:15 UTC (rev 21327)
+++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
2007-02-14 05:16:05 UTC (rev 21328)
@@ -138,10 +138,16 @@
this._displaySearchResults(module, rpcRequest);
break;
+ case modify:
+this._displayModifyResults(module, rpcRequest);
+break;
+
case add:
- case modify:
+this._displayAddResults(module, rpcRequest);
+break;
+
case delete:
-this._displayCommitResults(module, rpcRequest, requestType);
+this._displayDeleteResults(module, rpcRequest);
break;
case tree_open:
@@ -475,34 +481,51 @@
qx.Proto._confirmDeleteRecord = function()
{
- //this._newb.setEnabled(false);
- //this._modb.setEnabled(false);
- //this._delb.setEnabled(false);
this._ldbmod.showConfirmDelete();
};
-qx.Proto._displayCommitResults = function(module, rpcRequest, type)
+qx.Proto._displayModifyResults = function(module, rpcRequest)
{
+ var tree = module.fsm.getObject(tree);
+ tree.createDispatchDataEvent(changeSelection, tree.getSelectedNodes());
+
+ alert(Object successfully modified!);
+
+ this._switchToNormal();
+ //this._ldbmod.postCleanUp();
+}
+
+qx.Proto._displayAddResults = function(module, rpcRequest)
+{
var result = rpcRequest.getUserData(result);
- switch (type) {
- case add:
-alert(Object successfully added!);
-break;
+ var tree = module.fsm.getObject(tree);
+ var node = tree.getSelectedNodes()[0];
+
+ tree.getDataModel().prune(node.nodeId, false);
+ node.bOpened = false;
+ tree.toggleOpened(node);
- case modify:
-alert(Object successfully modified!);
-break;
+ alert(Object successfully added!);
- case delete:
-alert(Object Successfully deleted!);
-break;
- }
-
this._switchToNormal();
+ //this._ldbmod.postCleanUp();
+};
- //TODO: reload tree after add or delete
+qx.Proto._displayDeleteResults = function(module, rpcRequest, type)
+{
+ var result = rpcRequest.getUserData(result);
+ var tree = module.fsm.getObject(tree);
+ var node =
tree.getDataModel().getData()[tree.getSelectedNodes()[0].parentNodeId];
+
+ tree.getDataModel().prune(node.nodeId, false);
+ node.bOpened = false;
+ tree.toggleOpened(node);
+
+ alert(Object Successfully deleted!);
+
+ this._ldbmod.setBase();
};
qx.Proto._displaySearchResults = function(module, rpcRequest)
@@ -559,12 +582,14 @@
var parentNode = rpcRequest.getUserData(parentNode);
var attributes = rpcRequest.getUserData(attributes);
+ // Remove any existing children, they will be replaced by the result of this
call (refresh)
+ dataModel.setData();
+
// Any children?
if (! result || result[length] == 0)
{
// Nope. Remove parent's expand/contract button.
dataModel.setState(parentNode.nodeId, { bHideOpenClose : true });
-dataModel.setData();
return;
}
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
===
---
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
2007-02-14 04:47:15 UTC (rev 21327)
+++
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
2007-02-14 05:16:05 UTC (rev 21328)
@@ -97,8 +97,7 @@
if (this._active) {
if (this._type == add) {
- this._basedn.setValue(this.basedn);
- this._basedn.setWidth(8 * this.basedn.length);
+ this._basedn.setHtml(this.basedn);
}
}
}
@@ -113,6 +112,12 @@
this._setExitCallback(callback, obj);
+ if (this.basedn == ) {
+alert(Please select the parent node in the tree first!);
+this._callExitCallback();
+return;
+ }
+
this._active = true;
this._type = add;
@@ -130,8 +135,7 @@
// The basedn of the object
// TODO: add validator
- this._basedn = new qx.ui.form.TextField(this.basedn);
- this._basedn.setWidth(8 * this.basedn.length);
+ this._basedn = new qx.ui.basic.Label(this.basedn);
hlayout.add(dnlabel, this._rdn, dnsep, this._basedn);
@@ -211,18 +215,14 @@
this._mainArea.removeAll();
this._active = false;
this._type = null;
- return;
}
