[SCM] Samba Shared Repository - branch v3-6-test updated

[Michael Adam]

The branch, v3-6-test has been updated
       via  ac2ccbd s3:msg_idmap: The solaris cc compiler does not like unnamed 
unions as struct members - fix the build
       via  bd4ac8d s3: fix the waf build after adding smbd/msg_idmap.c
      from  903deb0 s3: Survive an idle child that was killed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit ac2ccbd871a81f41ee43f5fd1beb3f162cabfe3c
Author: Michael Adam <ob...@samba.org>
Date:   Mon Feb 28 15:52:25 2011 +0100

    s3:msg_idmap: The solaris cc compiler does not like unnamed unions as 
struct members - fix the build

commit bd4ac8dd239ce778b5d5f8e7e5588a4aaf1951cd
Author: Michael Adam <ob...@samba.org>
Date:   Mon Feb 28 15:36:11 2011 +0100

    s3: fix the waf build after adding smbd/msg_idmap.c

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/msg_idmap.c |   26 +++++++++++++-------------
 source3/wscript_build    |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 8cef268..8668919 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -38,7 +38,7 @@ struct id {
                uid_t uid;
                gid_t gid;
                struct dom_sid sid;
-       };
+       } id;
        enum {UID, GID, SID} type;
 };
 
@@ -51,18 +51,18 @@ static bool parse_id(const char* str, struct id* id)
        if (sscanf(str, "%cID %lu%c", &c, &ul, &trash) == 2) {
                switch(c) {
                case 'G':
-                       id->gid = ul;
+                       id->id.gid = ul;
                        id->type = GID;
                        return true;
                case 'U':
-                       id->uid = ul;
+                       id->id.uid = ul;
                        id->type = UID;
                        return true;
                default:
                        break;
                }
        } else if (string_to_sid(&sid, str)) {
-               id->sid = sid;
+               id->id.sid = sid;
                id->type = SID;
                return true;
        }
@@ -117,11 +117,11 @@ static bool id_in_use(const struct user_struct* user, 
const struct id* id)
 {
        switch(id->type) {
        case UID:
-               return uid_in_use(user, id->uid);
+               return uid_in_use(user, id->id.uid);
        case GID:
-               return gid_in_use(user, id->gid);
+               return gid_in_use(user, id->id.gid);
        case SID:
-               return sid_in_use(user, &id->sid);
+               return sid_in_use(user, &id->id.sid);
        default:
                break;
        }
@@ -132,16 +132,16 @@ static void delete_from_cache(const struct id* id)
 {
        switch(id->type) {
        case UID:
-               delete_uid_cache(id->uid);
-               idmap_cache_del_uid(id->uid);
+               delete_uid_cache(id->id.uid);
+               idmap_cache_del_uid(id->id.uid);
                break;
        case GID:
-               delete_gid_cache(id->gid);
-               idmap_cache_del_gid(id->gid);
+               delete_gid_cache(id->id.gid);
+               idmap_cache_del_gid(id->id.gid);
                break;
        case SID:
-               delete_sid_cache(&id->sid);
-               idmap_cache_del_sid(&id->sid);
+               delete_sid_cache(&id->id.sid);
+               idmap_cache_del_sid(&id->id.sid);
                break;
        default:
                break;
diff --git a/source3/wscript_build b/source3/wscript_build
index 016f412..28ad185 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -389,7 +389,7 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
 
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
-SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c'''
+SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c smbd/msg_idmap.c'''
 
 BUILDOPT_SRC = '''smbd/build_options.c'''
 


-- 
Samba Shared Repository