The branch, v4-0-test has been updated
via 1abb2b471a11305ae7e0da403eca3cfe1fe1b016 (commit)
via ba5a21998bfc1bd616e7a2d9647d284ca30a3574 (commit)
via a5b9d2f33279e0f96a36acbf3da7c018aadf08c9 (commit)
via 89d5b91d3c4dae754178c82cb7a24e7c5af09fcd (commit)
via d41b2e5ccd113ecf2f99896b1ce061ecb9ecc54d (commit)
via 37ed9fbeee37a1d86d6f6841eac5c1a0a85c1fcc (commit)
from 53b51660ae6b733b19b0ba3403f229b215de7b47 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 1abb2b471a11305ae7e0da403eca3cfe1fe1b016
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 10:56:24 2007 +0100
wbinfo: Handle SID_NAME_COMPUTER in sid_type_lookup
commit ba5a21998bfc1bd616e7a2d9647d284ca30a3574
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 10:44:06 2007 +0100
libnet: Fix includes to silence a warning
commit a5b9d2f33279e0f96a36acbf3da7c018aadf08c9
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 10:43:35 2007 +0100
libnet: Rename a variable so it does not shadow a global.
commit 89d5b91d3c4dae754178c82cb7a24e7c5af09fcd
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 09:54:21 2007 +0100
ejs: Remove cast to incompatible pointer.
commit d41b2e5ccd113ecf2f99896b1ce061ecb9ecc54d
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 00:11:06 2007 +0100
gentest: Fix a warning.
commit 37ed9fbeee37a1d86d6f6841eac5c1a0a85c1fcc
Author: Kai Blin <[EMAIL PROTECTED]>
Date: Wed Dec 26 00:10:34 2007 +0100
ldb: Get rid of a warning.
-----------------------------------------------------------------------
Summary of changes:
source/lib/ldb/include/ldb.h | 2 +-
source/libnet/libnet_join.c | 9 +++++----
source/nsswitch/wbinfo.c | 1 +
source/scripting/ejs/ejsnet/net_user.c | 8 ++++----
source/torture/gentest.c | 4 +++-
source/torture/libnet/libnet.c | 4 ++++
6 files changed, 18 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h
index e2ff8c6..2e54920 100644
--- a/source/lib/ldb/include/ldb.h
+++ b/source/lib/ldb/include/ldb.h
@@ -705,7 +705,7 @@ struct ldb_handle {
struct ldb_search {
struct ldb_dn *base;
enum ldb_scope scope;
- const struct ldb_parse_tree *tree;
+ struct ldb_parse_tree *tree;
const char * const *attrs;
struct ldb_result *res;
};
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 8297172..2213451 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1064,7 +1064,7 @@ static NTSTATUS libnet_Join_primary_domain(struct
libnet_context *ctx,
return NT_STATUS_INTERNAL_DB_CORRUPTION;
} else {
const struct ldb_val *private_keytab;
- const struct ldb_val *krb5_keytab;
+ const struct ldb_val *krb5_main_keytab;
const struct ldb_val *prior_secret;
const struct ldb_val *prior_modified_time;
int i;
@@ -1125,9 +1125,10 @@ static NTSTATUS libnet_Join_primary_domain(struct
libnet_context *ctx,
return NT_STATUS_NO_MEMORY;
}
}
- krb5_keytab = ldb_msg_find_ldb_val(msgs[0], "krb5Keytab");
- if (krb5_keytab) {
- rtn = samdb_msg_set_value(ldb, tmp_mem, msg,
"krb5Keytab", krb5_keytab);
+ krb5_main_keytab = ldb_msg_find_ldb_val(msgs[0], "krb5Keytab");
+ if (krb5_main_keytab) {
+ rtn = samdb_msg_set_value(ldb, tmp_mem, msg,
+ "krb5Keytab", krb5_main_keytab);
if (rtn == -1) {
r->out.error_string = NULL;
talloc_free(tmp_mem);
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 144c279..b274883 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -653,6 +653,7 @@ static const char *sid_type_lookup(enum lsa_SidType r)
case SID_NAME_DELETED: return "SID_NAME_DELETED"; break;
case SID_NAME_INVALID: return "SID_NAME_INVALID"; break;
case SID_NAME_UNKNOWN: return "SID_NAME_UNKNOWN"; break;
+ case SID_NAME_COMPUTER: return "SID_NAME_COMPUTER"; break;
}
return "Invalid sid type\n";
}
diff --git a/source/scripting/ejs/ejsnet/net_user.c
b/source/scripting/ejs/ejsnet/net_user.c
index 34524cc..57e538d 100644
--- a/source/scripting/ejs/ejsnet/net_user.c
+++ b/source/scripting/ejs/ejsnet/net_user.c
@@ -195,9 +195,9 @@ static int ejs_net_deleteuser(MprVarHandle eid, int argc,
char **argv)
ejsSetErrorMsg(eid, "ctx property returns null pointer");
goto done;
}
-
+
/* domain where the account is to be deleted */
- userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+ userman_domain = mprGetThisPtr(eid, "domain");
if (!userman_domain) {
ejsSetErrorMsg(eid, "domain property returns null pointer");
goto done;
@@ -258,9 +258,9 @@ static int ejs_net_userinfo(MprVarHandle eid, int argc,
char **argv)
ejsSetErrorMsg(eid, "ctx property returns null pointer");
goto done;
}
-
+
/* domain where the user account is to be queried */
- userman_domain = (struct libnet_context *)mprGetThisPtr(eid, "domain");
+ userman_domain = mprGetThisPtr(eid, "domain");
if (userman_domain == NULL) {
ejsSetErrorMsg(eid, "domain property returns null pointer");
return -1;
diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index c9e36b7..d50393b 100644
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -1637,7 +1637,8 @@ static bool cmp_fileinfo(int instance,
case RAW_FILEINFO_UNIX_BASIC:
case RAW_FILEINFO_UNIX_LINK:
case RAW_FILEINFO_SMB2_ALL_EAS:
- case RAW_FILEINFO_SMB2_ALL_INFORMATION:
+ case RAW_FILEINFO_SMB2_ALL_INFORMATION:
+ case RAW_FILEINFO_UNIX_INFO2:
break;
}
@@ -1775,6 +1776,7 @@ static void gen_setfileinfo(int instance, union
smb_setfileinfo *info)
case RAW_SFILEINFO_1032:
case RAW_SFILEINFO_1039:
case RAW_SFILEINFO_1040:
+ case RAW_SFILEINFO_UNIX_INFO2:
/* Untested */
break;
}
diff --git a/source/torture/libnet/libnet.c b/source/torture/libnet/libnet.c
index 261012e..3a75ffc 100644
--- a/source/torture/libnet/libnet.c
+++ b/source/torture/libnet/libnet.c
@@ -19,6 +19,10 @@
#include "includes.h"
#include "torture/torture.h"
+#include "librpc/rpc/dcerpc.h"
+#include "librpc/gen_ndr/security.h"
+#include "librpc/gen_ndr/lsa.h"
+#include "libnet/composite.h"
#include "torture/libnet/proto.h"
NTSTATUS torture_net_init(void)
--
Samba Shared Repository
