Author: jerry Date: 2007-04-04 04:28:28 +0000 (Wed, 04 Apr 2007) New Revision: 22069
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22069 Log: BUG 4447: Fix compile failure on AIX 5.2 (patch from William Jojo <[EMAIL PROTECTED]>) Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_aix.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c 2007-04-04 03:55:35 UTC (rev 22068) +++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_aix.c 2007-04-04 04:28:28 UTC (rev 22069) @@ -629,8 +629,10 @@ if (strcmp(attributes[i], S_ID) == 0) { results[i].attr_un.au_int = pwd->pw_uid; +#ifdef _AIXVERSION_530 } else if (strcmp(attributes[i], S_PGID) == 0) { results[i].attr_un.au_int = pwd->pw_gid; +#endif } else if (strcmp(attributes[i], S_PWD) == 0) { results[i].attr_un.au_char = strdup(pwd->pw_passwd); } else if (strcmp(attributes[i], S_HOME) == 0) { @@ -769,7 +771,9 @@ {S_PGRP, AL_USERATTR, SEC_CHAR}, {S_HOME, AL_USERATTR, SEC_CHAR}, {S_SHELL, AL_USERATTR, SEC_CHAR}, +#ifdef _AIXVERSION_530 {S_PGID, AL_USERATTR, SEC_INT}, +#endif {S_GECOS, AL_USERATTR, SEC_CHAR}, {S_SHELL, AL_USERATTR, SEC_CHAR}, {S_PGRP, AL_USERATTR, SEC_CHAR}, Modified: branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_aix.c =================================================================== --- branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_aix.c 2007-04-04 03:55:35 UTC (rev 22068) +++ branches/SAMBA_3_0_25/source/nsswitch/winbind_nss_aix.c 2007-04-04 04:28:28 UTC (rev 22069) @@ -629,8 +629,10 @@ if (strcmp(attributes[i], S_ID) == 0) { results[i].attr_un.au_int = pwd->pw_uid; +#ifdef _AIXVERSION_530 } else if (strcmp(attributes[i], S_PGID) == 0) { results[i].attr_un.au_int = pwd->pw_gid; +#endif } else if (strcmp(attributes[i], S_PWD) == 0) { results[i].attr_un.au_char = strdup(pwd->pw_passwd); } else if (strcmp(attributes[i], S_HOME) == 0) { @@ -769,7 +771,9 @@ {S_PGRP, AL_USERATTR, SEC_CHAR}, {S_HOME, AL_USERATTR, SEC_CHAR}, {S_SHELL, AL_USERATTR, SEC_CHAR}, +#ifdef _AIXVERSION_530 {S_PGID, AL_USERATTR, SEC_INT}, +#endif {S_GECOS, AL_USERATTR, SEC_CHAR}, {S_SHELL, AL_USERATTR, SEC_CHAR}, {S_PGRP, AL_USERATTR, SEC_CHAR},
