summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba3sam.c52
-rwxr-xr-xsource4/script/tests/test_s3upgrade.sh1
2 files changed, 51 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index b823f11f8c..769cda2903 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -8,6 +8,7 @@
#include "ldb/modules/ldb_map.h"
#include "ldb/include/ldb.h"
#include "ldb/include/ldb_private.h"
+#include "librpc/gen_ndr/ndr_security.h"
/* FIXME:
* sambaSID -> member (dn!)
@@ -81,6 +82,51 @@ static struct ldb_val convert_unix_name2id(struct ldb_module *module, TALLOC_CTX
return ldb_val_dup(ctx, val);
}
+static struct ldb_val encode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
+{
+ struct dom_sid *sid = dom_sid_parse_talloc(ctx, (char *)val->data);
+ struct ldb_val *out = talloc_zero(out, struct ldb_val);
+ NTSTATUS status;
+
+ if (sid == NULL) {
+ return *out;
+ }
+ status = ndr_push_struct_blob(out, ctx, sid,
+ (ndr_push_flags_fn_t)ndr_push_dom_sid);
+ talloc_free(sid);
+ if (!NT_STATUS_IS_OK(status)) {
+ return *out;
+ }
+
+ return *out;
+}
+
+static struct ldb_val decode_sid(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
+{
+ struct dom_sid *sid;
+ NTSTATUS status;
+ struct ldb_val *out = talloc_zero(ctx, struct ldb_val);
+
+ sid = talloc(ctx, struct dom_sid);
+ if (sid == NULL) {
+ return *out;
+ }
+ status = ndr_pull_struct_blob(val, sid, sid,
+ (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(sid);
+ return *out;
+ }
+ out->data = (uint8_t *)dom_sid_string(ctx, sid);
+ talloc_free(sid);
+ if (out->data == NULL) {
+ return *out;
+ }
+ out->length = strlen((const char *)out->data);
+
+ return *out;
+}
+
const struct ldb_map_objectclass samba3_objectclasses[] = {
{ "group", "sambaGroupMapping" },
{ "user", "sambaSAMAccount" },
@@ -304,8 +350,10 @@ const struct ldb_map_attribute samba3_attributes[] =
/* sambaSID -> objectSid*/
{
.local_name = "objectSid",
- .type = MAP_RENAME,
- .u.rename.remote_name = "sambaSID",
+ .type = MAP_CONVERT,
+ .u.convert.remote_name = "sambaSID",
+ .u.convert.convert_local = decode_sid,
+ .u.convert.convert_remote = encode_sid,
},
/* sambaPwdLastSet -> pwdLastSet */
diff --git a/source4/script/tests/test_s3upgrade.sh b/source4/script/tests/test_s3upgrade.sh
index e4e5d828e5..d981d5410a 100755
--- a/source4/script/tests/test_s3upgrade.sh
+++ b/source4/script/tests/test_s3upgrade.sh
@@ -10,5 +10,6 @@ fi
mkdir -p $PREFIX
rm -f $PREFIX/*
+bin/smbscript ../testprogs/ejs/samba3sam
bin/smbscript ../testdata/samba3/verify ../testdata/samba3
bin/smbscript setup/upgrade --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf