diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-03-08 20:19:48 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-03-09 15:29:37 -0400 |
| commit | 5ea221d5325a2b60ec872a3864953178c8b593a0 (patch) | |
| tree | 5a67d8702ec6921b8a390c69e3235a949ec6900a /server/db | |
| parent | 10038e62d8ea6ee570346f98819e1994e70d47a5 (diff) | |
| download | sssd-5ea221d5325a2b60ec872a3864953178c8b593a0.tar.gz sssd-5ea221d5325a2b60ec872a3864953178c8b593a0.tar.xz sssd-5ea221d5325a2b60ec872a3864953178c8b593a0.zip | |
Do not duplicate attribute names macros.
Also shorten names oh other user attributes.
Diffstat (limited to 'server/db')
| -rw-r--r-- | server/db/sysdb.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/server/db/sysdb.h b/server/db/sysdb.h index e323ad0d6..c278e64cb 100644 --- a/server/db/sysdb.h +++ b/server/db/sysdb.h @@ -53,16 +53,13 @@ #define SYSDB_MEMBER "member" #define SYSDB_LEGACY_MEMBER "memberUid" -#define SYSDB_USER_ATTR_DEFAULTGROUP "defaultGroup" -#define SYSDB_USER_ATTR_GECOS "gecos" -#define SYSDB_USER_ATTR_HOMEDIR "homeDirectory" -#define SYSDB_USER_ATTR_SHELL "shell" -#define SYSDB_USER_ATTR_FULLNAME "fullName" -#define SYSDB_USER_ATTR_LOCALE "locale" -#define SYSDB_USER_ATTR_KEYBOARD "keyboard" -#define SYSDB_USER_ATTR_SESSION "session" -#define SYSDB_USER_ATTR_LAST_LOGIN "lastLogin" -#define SYSDB_USER_ATTR_USERPIC "userPicture" +#define SYSDB_DEFAULTGROUP "defaultGroup" +#define SYSDB_GECOS "gecos" +#define SYSDB_LOCALE "locale" +#define SYSDB_KEYBOARD "keyboard" +#define SYSDB_SESSION "session" +#define SYSDB_LAST_LOGIN "lastLogin" +#define SYSDB_USERPIC "userPicture" #define SYSDB_LAST_UPDATE "lastUpdate" @@ -81,7 +78,7 @@ #define SYSDB_INITGR_LEGACY_FILTER "(&(objectclass="SYSDB_GROUP_CLASS")("SYSDB_LEGACY_MEMBER"=%s))" -#define SYSDB_GETCACHED_FILTER "(&(objectclass="SYSDB_USER_CLASS")("SYSDB_USER_ATTR_LAST_LOGIN">=%lu))" +#define SYSDB_GETCACHED_FILTER "(&(objectclass="SYSDB_USER_CLASS")("SYSDB_LAST_LOGIN">=%lu))" #define SYSDB_PW_ATTRS {SYSDB_NAME, SYSDB_UIDNUM, \ SYSDB_GIDNUM, SYSDB_FULLNAME, \ @@ -89,16 +86,16 @@ SYSDB_LAST_UPDATE, \ "objectClass", \ NULL} -#define SYSDB_USER_ATTRS {SYSDB_USER_ATTR_DEFAULTGROUP, \ - SYSDB_USER_ATTR_GECOS, \ - SYSDB_USER_ATTR_HOMEDIR, \ - SYSDB_USER_ATTR_SHELL, \ - SYSDB_USER_ATTR_FULLNAME, \ - SYSDB_USER_ATTR_LOCALE, \ - SYSDB_USER_ATTR_KEYBOARD, \ - SYSDB_USER_ATTR_SESSION, \ - SYSDB_USER_ATTR_LAST_LOGIN, \ - SYSDB_USER_ATTR_USERPIC, \ +#define SYSDB_USER_ATTRS {SYSDB_DEFAULTGROUP, \ + SYSDB_GECOS, \ + SYSDB_HOMEDIR, \ + SYSDB_SHELL, \ + SYSDB_FULLNAME, \ + SYSDB_LOCALE, \ + SYSDB_KEYBOARD, \ + SYSDB_SESSION, \ + SYSDB_LAST_LOGIN, \ + SYSDB_USERPIC, \ SYSDB_LAST_UPDATE, \ NULL} #define SYSDB_GRNAM_ATTRS {SYSDB_NAME, SYSDB_GIDNUM, \ |