svn commit: samba r24277 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

[abartlet]

Author: abartlet
Date: 2007-08-08 06:37:37 + (Wed, 08 Aug 2007)
New Revision: 24277

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24277

Log:
Tidyup as requested by metze.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectclass.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectclass.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectclass.c  
2007-08-08 03:20:37 UTC (rev 24276)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectclass.c  
2007-08-08 06:37:37 UTC (rev 24277)
@@ -201,16 +201,18 @@
return LDB_SUCCESS;
 }
 
-DATA_BLOB *get_sd(struct ldb_module *module, TALLOC_CTX *mem_ctx, 
- const struct dsdb_class *objectclass) 
+static DATA_BLOB *get_sd(struct ldb_module *module, TALLOC_CTX *mem_ctx, 
+const struct dsdb_class *objectclass) 
 {
NTSTATUS status;
DATA_BLOB *linear_sd;
struct auth_session_info *session_info
= ldb_get_opaque(module-ldb, sessionInfo);
-   struct security_descriptor *sd = sddl_decode(mem_ctx, 
-
objectclass-defaultSecurityDescriptor,
-
samdb_domain_sid(module-ldb));
+   struct security_descriptor *sd
+   = sddl_decode(mem_ctx, 
+ objectclass-defaultSecurityDescriptor,
+ samdb_domain_sid(module-ldb));
+
if (!session_info || !session_info-security_token) {
return NULL;
}
@@ -300,17 +302,21 @@
for (current = sorted; current; current = current-next) {
ret = ldb_msg_add_string(msg, objectClass, 
current-objectclass);
if (ret != LDB_SUCCESS) {
-   ldb_set_errstring(module-ldb, objectclass: could not 
re-add sorted objectclass to modify msg);
+   ldb_set_errstring(module-ldb, 
+ objectclass: could not re-add sorted 

+ objectclass to modify msg);
talloc_free(mem_ctx);
return ret;
}
/* Last one is the critical one */
if (schema  !current-next) {
const struct dsdb_class *objectclass
-   = dsdb_class_by_lDAPDisplayName(schema, 
current-objectclass);
+   = dsdb_class_by_lDAPDisplayName(schema, 
+   
current-objectclass);
if (objectclass) {
if (!ldb_msg_find_element(msg, 
objectCategory)) {
-   ldb_msg_add_string(msg, 
objectCategory, objectclass-defaultObjectCategory);
+   ldb_msg_add_string(msg, 
objectCategory, 
+  
objectclass-defaultObjectCategory);
}
if (!ldb_msg_find_element(msg, 
ntSecurityDescriptor)) {
DATA_BLOB *sd = get_sd(module, mem_ctx, 
objectclass);

Re: svn commit: samba r24277 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

[Stefan (metze) Metzmacher]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

[EMAIL PROTECTED] schrieb:
 -DATA_BLOB *get_sd(struct ldb_module *module, TALLOC_CTX *mem_ctx, 
 -   const struct dsdb_class *objectclass) 
 +static DATA_BLOB *get_sd(struct ldb_module *module, TALLOC_CTX *mem_ctx, 
 +  const struct dsdb_class *objectclass) 
  {
   NTSTATUS status;
   DATA_BLOB *linear_sd;
   struct auth_session_info *session_info
   = ldb_get_opaque(module-ldb, sessionInfo);
 - struct security_descriptor *sd = sddl_decode(mem_ctx, 
 -  
 objectclass-defaultSecurityDescriptor,
 -  
 samdb_domain_sid(module-ldb));
 + struct security_descriptor *sd
 + = sddl_decode(mem_ctx, 
 +   objectclass-defaultSecurityDescriptor,
 +   samdb_domain_sid(module-ldb));
 +
   if (!session_info || !session_info-security_token) {
   return NULL;
   }

what I meant was something like this:

struct auth_session_info *session_info;
struct dom_sid *domsid;
struct security_descriptor *sd;

session_info = ldb_get_opaque(module-ldb, sessionInfo);
if (!session_info || !session_info-security_token) {
return NULL;
}

domsid = samdb_domain_sid(module-ldb);
if (!domsid) {
return NULL;
}

sd = sddl_decode(mem_ctx,
 objectclass-defaultSecurityDescriptor,
 domsid);
if (!sd) {
return NULL;
}

and maybe a more verbose error code than NULL would be good:-)

metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFGuhfmm70gjA5TCD8RAmQyAKCno4QAeBOXiMpTN3g8TqLeHrt4NQCgqf+o
hcuXPTkyHwGAnK+naDM2Yd8=
=h6mN
-END PGP SIGNATURE-