diff options
| author | Gerald Carter <jerry@samba.org> | 2004-04-07 12:43:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:10 -0500 |
| commit | b393469d9581f20e4d4c52633b952ee984cca36f (patch) | |
| tree | 92472b0af539644013e95f2c55ebba56c072b28f /source/lib | |
| parent | 1fae60ab20c5cbe396dc8af1c8c9a98d5683fdf4 (diff) | |
| download | samba-b393469d9581f20e4d4c52633b952ee984cca36f.tar.gz samba-b393469d9581f20e4d4c52633b952ee984cca36f.tar.xz samba-b393469d9581f20e4d4c52633b952ee984cca36f.zip | |
r116: volker's patch for local group and group nesting
Diffstat (limited to 'source/lib')
| -rw-r--r-- | source/lib/smbldap.c | 2 | ||||
| -rw-r--r-- | source/lib/util_str.c | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c index f4f0170479f..21e2a7c1018 100644 --- a/source/lib/smbldap.c +++ b/source/lib/smbldap.c @@ -122,6 +122,7 @@ ATTRIB_MAP_ENTRY groupmap_attr_list[] = { { LDAP_ATTR_GIDNUMBER, LDAP_ATTRIBUTE_GIDNUMBER}, { LDAP_ATTR_GROUP_SID, LDAP_ATTRIBUTE_SID }, { LDAP_ATTR_GROUP_TYPE, "sambaGroupType" }, + { LDAP_ATTR_SID_LIST, "sambaSIDList" }, { LDAP_ATTR_DESC, "description" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, { LDAP_ATTR_CN, "cn" }, @@ -134,6 +135,7 @@ ATTRIB_MAP_ENTRY groupmap_attr_list_to_delete[] = { { LDAP_ATTR_GROUP_TYPE, "sambaGroupType" }, { LDAP_ATTR_DESC, "description" }, { LDAP_ATTR_DISPLAY_NAME, "displayName" }, + { LDAP_ATTR_SID_LIST, "sambaSIDList" }, { LDAP_ATTR_LIST_END, NULL } }; diff --git a/source/lib/util_str.c b/source/lib/util_str.c index e4b07a4b731..600c830aced 100644 --- a/source/lib/util_str.c +++ b/source/lib/util_str.c @@ -2038,3 +2038,21 @@ SMB_BIG_UINT STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr) return val; } + +void string_append(char **left, const char *right) +{ + int new_len = strlen(right) + 1; + + if (*left == NULL) { + *left = malloc(new_len); + *left[0] = '\0'; + } else { + new_len += strlen(*left); + *left = Realloc(*left, new_len); + } + + if (*left == NULL) + return; + + safe_strcat(*left, right, new_len-1); +} |