Move ads flags mapping to lib/
authorVolker Lendecke <vl@samba.org>
Sat, 30 May 2009 08:12:53 +0000 (10:12 +0200)
committerVolker Lendecke <vl@samba.org>
Sat, 30 May 2009 08:21:38 +0000 (10:21 +0200)
source3/Makefile.in
source3/lib/ads_flags.c [new file with mode: 0644]
source3/libads/ads_utils.c

index 613e1277704b2df6a7b56d2ba2bcb4b351633c69..9c87c6776a87a21179c667c9a1c248d3c06f771a 100644 (file)
@@ -372,6 +372,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          lib/interface.o lib/pidfile.o \
          lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
          lib/username.o \
+         lib/ads_flags.o \
          lib/util_pw.o lib/access.o lib/smbrun.o \
          lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
          lib/wins_srv.o \
diff --git a/source3/lib/ads_flags.c b/source3/lib/ads_flags.c
new file mode 100644 (file)
index 0000000..a8fa062
--- /dev/null
@@ -0,0 +1,150 @@
+/*
+   Unix SMB/CIFS implementation.
+   ads (active directory) utility library
+
+   Copyright (C) Stefan (metze) Metzmacher 2002
+   Copyright (C) Andrew Tridgell 2001
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+
+/*
+translated the ACB_CTRL Flags to UserFlags (userAccountControl)
+*/
+uint32 ads_acb2uf(uint32 acb)
+{
+       uint32 uf = 0x00000000;
+
+       if (acb & ACB_DISABLED)                 uf |= UF_ACCOUNTDISABLE;
+       if (acb & ACB_HOMDIRREQ)                uf |= UF_HOMEDIR_REQUIRED;
+       if (acb & ACB_PWNOTREQ)                 uf |= UF_PASSWD_NOTREQD;
+       if (acb & ACB_TEMPDUP)                  uf |= UF_TEMP_DUPLICATE_ACCOUNT;
+       if (acb & ACB_NORMAL)                   uf |= UF_NORMAL_ACCOUNT;
+       if (acb & ACB_MNS)                      uf |= UF_MNS_LOGON_ACCOUNT;
+       if (acb & ACB_DOMTRUST)                 uf |= UF_INTERDOMAIN_TRUST_ACCOUNT;
+       if (acb & ACB_WSTRUST)                  uf |= UF_WORKSTATION_TRUST_ACCOUNT;
+       if (acb & ACB_SVRTRUST)                 uf |= UF_SERVER_TRUST_ACCOUNT;
+       if (acb & ACB_PWNOEXP)                  uf |= UF_DONT_EXPIRE_PASSWD;
+       if (acb & ACB_AUTOLOCK)                 uf |= UF_LOCKOUT;
+       if (acb & ACB_USE_DES_KEY_ONLY)         uf |= UF_USE_DES_KEY_ONLY;
+       if (acb & ACB_SMARTCARD_REQUIRED)       uf |= UF_SMARTCARD_REQUIRED;
+       if (acb & ACB_TRUSTED_FOR_DELEGATION)   uf |= UF_TRUSTED_FOR_DELEGATION;
+       if (acb & ACB_DONT_REQUIRE_PREAUTH)     uf |= UF_DONT_REQUIRE_PREAUTH;
+       if (acb & ACB_NO_AUTH_DATA_REQD)        uf |= UF_NO_AUTH_DATA_REQUIRED;
+       if (acb & ACB_NOT_DELEGATED)            uf |= UF_NOT_DELEGATED;
+       if (acb & ACB_ENC_TXT_PWD_ALLOWED)      uf |= UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED;
+
+       return uf;
+}
+
+/*
+translated the UserFlags (userAccountControl) to ACB_CTRL Flags
+*/
+uint32 ads_uf2acb(uint32 uf)
+{
+       uint32 acb = 0x00000000;
+
+       if (uf & UF_ACCOUNTDISABLE)             acb |= ACB_DISABLED;
+       if (uf & UF_HOMEDIR_REQUIRED)           acb |= ACB_HOMDIRREQ;
+       if (uf & UF_PASSWD_NOTREQD)             acb |= ACB_PWNOTREQ;
+       if (uf & UF_MNS_LOGON_ACCOUNT)          acb |= ACB_MNS;
+       if (uf & UF_DONT_EXPIRE_PASSWD)         acb |= ACB_PWNOEXP;
+       if (uf & UF_LOCKOUT)                    acb |= ACB_AUTOLOCK;
+       if (uf & UF_USE_DES_KEY_ONLY)           acb |= ACB_USE_DES_KEY_ONLY;
+       if (uf & UF_SMARTCARD_REQUIRED)         acb |= ACB_SMARTCARD_REQUIRED;
+       if (uf & UF_TRUSTED_FOR_DELEGATION)     acb |= ACB_TRUSTED_FOR_DELEGATION;
+       if (uf & UF_DONT_REQUIRE_PREAUTH)       acb |= ACB_DONT_REQUIRE_PREAUTH;
+       if (uf & UF_NO_AUTH_DATA_REQUIRED)      acb |= ACB_NO_AUTH_DATA_REQD;
+       if (uf & UF_NOT_DELEGATED)              acb |= ACB_NOT_DELEGATED;
+       if (uf & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED) acb |= ACB_ENC_TXT_PWD_ALLOWED;
+
+       switch (uf & UF_ACCOUNT_TYPE_MASK)
+       {
+               case UF_TEMP_DUPLICATE_ACCOUNT:         acb |= ACB_TEMPDUP;break;
+               case UF_NORMAL_ACCOUNT:                 acb |= ACB_NORMAL;break;
+               case UF_INTERDOMAIN_TRUST_ACCOUNT:      acb |= ACB_DOMTRUST;break;
+               case UF_WORKSTATION_TRUST_ACCOUNT:      acb |= ACB_WSTRUST;break;
+               case UF_SERVER_TRUST_ACCOUNT:           acb |= ACB_SVRTRUST;break;
+               /*Fix Me: what should we do here? */
+               default:                                acb |= ACB_NORMAL;break;
+       }
+
+       return acb;
+}
+
+/*
+get the accountType from the UserFlags
+*/
+uint32 ads_uf2atype(uint32 uf)
+{
+       uint32 atype = 0x00000000;
+
+       if (uf & UF_NORMAL_ACCOUNT)                     atype = ATYPE_NORMAL_ACCOUNT;
+       else if (uf & UF_TEMP_DUPLICATE_ACCOUNT)        atype = ATYPE_NORMAL_ACCOUNT;
+       else if (uf & UF_SERVER_TRUST_ACCOUNT)          atype = ATYPE_WORKSTATION_TRUST;
+       else if (uf & UF_WORKSTATION_TRUST_ACCOUNT)     atype = ATYPE_WORKSTATION_TRUST;
+       else if (uf & UF_INTERDOMAIN_TRUST_ACCOUNT)     atype = ATYPE_INTERDOMAIN_TRUST;
+
+       return atype;
+}
+
+/*
+get the accountType from the groupType
+*/
+uint32 ads_gtype2atype(uint32 gtype)
+{
+       uint32 atype = 0x00000000;
+
+       switch(gtype) {
+               case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
+                       atype = ATYPE_SECURITY_LOCAL_GROUP;
+                       break;
+               case GTYPE_SECURITY_DOMAIN_LOCAL_GROUP:
+                       atype = ATYPE_SECURITY_LOCAL_GROUP;
+                       break;
+               case GTYPE_SECURITY_GLOBAL_GROUP:
+                       atype = ATYPE_SECURITY_GLOBAL_GROUP;
+                       break;
+
+               case GTYPE_DISTRIBUTION_GLOBAL_GROUP:
+                       atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP;
+                       break;
+               case GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP:
+                       atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP;
+                       break;
+               case GTYPE_DISTRIBUTION_UNIVERSAL_GROUP:
+                       atype = ATYPE_DISTRIBUTION_LOCAL_GROUP;
+                       break;
+       }
+
+       return atype;
+}
+
+/* turn a sAMAccountType into a SID_NAME_USE */
+enum lsa_SidType ads_atype_map(uint32 atype)
+{
+       switch (atype & 0xF0000000) {
+       case ATYPE_GLOBAL_GROUP:
+               return SID_NAME_DOM_GRP;
+       case ATYPE_SECURITY_LOCAL_GROUP:
+               return SID_NAME_ALIAS;
+       case ATYPE_ACCOUNT:
+               return SID_NAME_USER;
+       default:
+               DEBUG(1,("hmm, need to map account type 0x%x\n", atype));
+       }
+       return SID_NAME_UNKNOWN;
+}
index fc2ea9d9fd11662bd0d1258b92f44af485d03bc6..213242c223470be3abd4785ed581eeaab392b274 100644 (file)
-/* 
+/*
    Unix SMB/CIFS implementation.
    ads (active directory) utility library
-   
+
    Copyright (C) Stefan (metze) Metzmacher 2002
    Copyright (C) Andrew Tridgell 2001
-  
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
-/* 
-translated the ACB_CTRL Flags to UserFlags (userAccountControl) 
-*/ 
-uint32 ads_acb2uf(uint32 acb)
-{
-       uint32 uf = 0x00000000;
-       
-       if (acb & ACB_DISABLED)                 uf |= UF_ACCOUNTDISABLE;
-       if (acb & ACB_HOMDIRREQ)                uf |= UF_HOMEDIR_REQUIRED;
-       if (acb & ACB_PWNOTREQ)                 uf |= UF_PASSWD_NOTREQD;        
-       if (acb & ACB_TEMPDUP)                  uf |= UF_TEMP_DUPLICATE_ACCOUNT;        
-       if (acb & ACB_NORMAL)                   uf |= UF_NORMAL_ACCOUNT;
-       if (acb & ACB_MNS)                      uf |= UF_MNS_LOGON_ACCOUNT;
-       if (acb & ACB_DOMTRUST)                 uf |= UF_INTERDOMAIN_TRUST_ACCOUNT;
-       if (acb & ACB_WSTRUST)                  uf |= UF_WORKSTATION_TRUST_ACCOUNT;
-       if (acb & ACB_SVRTRUST)                 uf |= UF_SERVER_TRUST_ACCOUNT;
-       if (acb & ACB_PWNOEXP)                  uf |= UF_DONT_EXPIRE_PASSWD;
-       if (acb & ACB_AUTOLOCK)                 uf |= UF_LOCKOUT;
-       if (acb & ACB_USE_DES_KEY_ONLY)         uf |= UF_USE_DES_KEY_ONLY;
-       if (acb & ACB_SMARTCARD_REQUIRED)       uf |= UF_SMARTCARD_REQUIRED;
-       if (acb & ACB_TRUSTED_FOR_DELEGATION)   uf |= UF_TRUSTED_FOR_DELEGATION;
-       if (acb & ACB_DONT_REQUIRE_PREAUTH)     uf |= UF_DONT_REQUIRE_PREAUTH;
-       if (acb & ACB_NO_AUTH_DATA_REQD)        uf |= UF_NO_AUTH_DATA_REQUIRED;
-       if (acb & ACB_NOT_DELEGATED)            uf |= UF_NOT_DELEGATED;
-       if (acb & ACB_ENC_TXT_PWD_ALLOWED)      uf |= UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED;
-
-       return uf;
-}
-
-/*
-translated the UserFlags (userAccountControl) to ACB_CTRL Flags
-*/
-uint32 ads_uf2acb(uint32 uf)
-{
-       uint32 acb = 0x00000000;
-       
-       if (uf & UF_ACCOUNTDISABLE)             acb |= ACB_DISABLED;
-       if (uf & UF_HOMEDIR_REQUIRED)           acb |= ACB_HOMDIRREQ;
-       if (uf & UF_PASSWD_NOTREQD)             acb |= ACB_PWNOTREQ;    
-       if (uf & UF_MNS_LOGON_ACCOUNT)          acb |= ACB_MNS;
-       if (uf & UF_DONT_EXPIRE_PASSWD)         acb |= ACB_PWNOEXP;
-       if (uf & UF_LOCKOUT)                    acb |= ACB_AUTOLOCK;
-       if (uf & UF_USE_DES_KEY_ONLY)           acb |= ACB_USE_DES_KEY_ONLY;
-       if (uf & UF_SMARTCARD_REQUIRED)         acb |= ACB_SMARTCARD_REQUIRED;
-       if (uf & UF_TRUSTED_FOR_DELEGATION)     acb |= ACB_TRUSTED_FOR_DELEGATION;
-       if (uf & UF_DONT_REQUIRE_PREAUTH)       acb |= ACB_DONT_REQUIRE_PREAUTH;
-       if (uf & UF_NO_AUTH_DATA_REQUIRED)      acb |= ACB_NO_AUTH_DATA_REQD;
-       if (uf & UF_NOT_DELEGATED)              acb |= ACB_NOT_DELEGATED;
-       if (uf & UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED) acb |= ACB_ENC_TXT_PWD_ALLOWED;
-       
-       switch (uf & UF_ACCOUNT_TYPE_MASK)
-       {
-               case UF_TEMP_DUPLICATE_ACCOUNT:         acb |= ACB_TEMPDUP;break;       
-               case UF_NORMAL_ACCOUNT:                 acb |= ACB_NORMAL;break;
-               case UF_INTERDOMAIN_TRUST_ACCOUNT:      acb |= ACB_DOMTRUST;break;
-               case UF_WORKSTATION_TRUST_ACCOUNT:      acb |= ACB_WSTRUST;break;
-               case UF_SERVER_TRUST_ACCOUNT:           acb |= ACB_SVRTRUST;break;
-               /*Fix Me: what should we do here? */
-               default:                                acb |= ACB_NORMAL;break;
-       }
-
-       return acb;
-}
-
-/* 
-get the accountType from the UserFlags
-*/
-uint32 ads_uf2atype(uint32 uf)
-{
-       uint32 atype = 0x00000000;
-               
-       if (uf & UF_NORMAL_ACCOUNT)                     atype = ATYPE_NORMAL_ACCOUNT;
-       else if (uf & UF_TEMP_DUPLICATE_ACCOUNT)        atype = ATYPE_NORMAL_ACCOUNT;
-       else if (uf & UF_SERVER_TRUST_ACCOUNT)          atype = ATYPE_WORKSTATION_TRUST;
-       else if (uf & UF_WORKSTATION_TRUST_ACCOUNT)     atype = ATYPE_WORKSTATION_TRUST;
-       else if (uf & UF_INTERDOMAIN_TRUST_ACCOUNT)     atype = ATYPE_INTERDOMAIN_TRUST;
-
-       return atype;
-} 
-
-/* 
-get the accountType from the groupType
-*/
-uint32 ads_gtype2atype(uint32 gtype)
-{
-       uint32 atype = 0x00000000;
-       
-       switch(gtype) {
-               case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
-                       atype = ATYPE_SECURITY_LOCAL_GROUP;
-                       break;
-               case GTYPE_SECURITY_DOMAIN_LOCAL_GROUP:
-                       atype = ATYPE_SECURITY_LOCAL_GROUP;
-                       break;
-               case GTYPE_SECURITY_GLOBAL_GROUP:
-                       atype = ATYPE_SECURITY_GLOBAL_GROUP;
-                       break;
-       
-               case GTYPE_DISTRIBUTION_GLOBAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP;
-                       break;
-               case GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP;
-                       break;
-               case GTYPE_DISTRIBUTION_UNIVERSAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_LOCAL_GROUP;
-                       break;
-       }
-
-       return atype;
-}
-
-/* turn a sAMAccountType into a SID_NAME_USE */
-enum lsa_SidType ads_atype_map(uint32 atype)
-{
-       switch (atype & 0xF0000000) {
-       case ATYPE_GLOBAL_GROUP:
-               return SID_NAME_DOM_GRP;
-       case ATYPE_SECURITY_LOCAL_GROUP:
-               return SID_NAME_ALIAS;
-       case ATYPE_ACCOUNT:
-               return SID_NAME_USER;
-       default:
-               DEBUG(1,("hmm, need to map account type 0x%x\n", atype));
-       }
-       return SID_NAME_UNKNOWN;
-}
-
 const char *ads_get_ldap_server_name(ADS_STRUCT *ads)
 {
        return ads->config.ldap_server_name;