Merged PR 6158: Add ifdef guards for nss shadow function #147438

Add ifdef guards for nss shadow function #147438 Aix doesn't support shadow database Related work items: #147438
BeyondTrust · May 28, 2018 · 443d3e4 · 443d3e4
1 parent 042f0d1
commit 443d3e4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/lsass/interop/nsswitch/common/nss-user.c b/lsass/interop/nsswitch/common/nss-user.c
@@ -67,7 +67,7 @@ LsaNssClearEnumUsersState(
             );
         pState->ppUserInfoList = (HANDLE)NULL;
     }
-    
+
     if (hLsaConnection && pState->hResume != (HANDLE)NULL)
     {
         LsaEndEnumUsers(hLsaConnection, pState->hResume);
@@ -267,6 +267,7 @@ LsaNssWriteUserInfo(
     goto cleanup;
 }
 
+#ifdef HAVE_SHADOW_H
 DWORD
 LsaNssWriteShadowInfo(
     DWORD        dwUserInfoLevel,
@@ -360,6 +361,7 @@ LsaNssWriteShadowInfo(
 
     goto cleanup;
 }
+#endif
 
 NSS_STATUS
 LsaNssCommonPasswdSetpwent(
@@ -374,7 +376,7 @@ LsaNssCommonPasswdSetpwent(
             LsaNssCommonEnsureConnected(pConnection));
     BAIL_ON_NSS_ERROR(ret);
     hLsaConnection = pConnection->hLsaConnection;
-    
+
     LsaNssClearEnumUsersState(hLsaConnection, pEnumUsersState);
 
     ret = MAP_LSA_ERROR(NULL,
@@ -465,7 +467,7 @@ LsaNssCommonPasswdGetpwent(
             {
                 bIgnoreEntry = TRUE;
             }
-            else 
+            else
             {
                 ret = MAP_LSA_ERROR(pErrorNumber,
                         LsaNssWriteUserInfo(
@@ -475,7 +477,7 @@ LsaNssCommonPasswdGetpwent(
                         &pszBuf,
                         bufLen));
                 BAIL_ON_NSS_ERROR(ret);
-                
+
                 ret = NSS_STATUS_SUCCESS;
             }
 
@@ -506,7 +508,7 @@ LsaNssCommonPasswdGetpwent(
     else
     {
         LsaNssClearEnumUsersState(hLsaConnection, pEnumUsersState);
-        
+
         if ( hLsaConnection != (HANDLE)NULL)
         {
             if (ret != NSS_STATUS_TRYAGAIN && ret != NSS_STATUS_NOTFOUND)
@@ -663,6 +665,7 @@ LsaNssCommonPasswdGetpwuid(
     goto cleanup;
 }
 
+#ifdef HAVE_SHADOW_H
 NSS_STATUS
 LsaNssCommonShadowGetspent(
     PLSA_NSS_CACHED_HANDLE  pConnection,
@@ -726,7 +729,7 @@ LsaNssCommonShadowGetspent(
             {
                 bIgnoreEntry = TRUE;
             }
-            else 
+            else
             {
                 ret = MAP_LSA_ERROR(pErrorNumber,
                         LsaNssWriteShadowInfo(
@@ -736,7 +739,7 @@ LsaNssCommonShadowGetspent(
                         &pszBuf,
                         bufLen));
                 BAIL_ON_NSS_ERROR(ret);
-                
+
                 ret = NSS_STATUS_SUCCESS;
             }
 
@@ -767,7 +770,7 @@ LsaNssCommonShadowGetspent(
     else
     {
         LsaNssClearEnumUsersState(hLsaConnection, pEnumUsersState);
-        
+
         if ( hLsaConnection != (HANDLE)NULL)
         {
             if (ret != NSS_STATUS_TRYAGAIN && ret != NSS_STATUS_NOTFOUND)
@@ -849,3 +852,4 @@ LsaNssCommonShadowGetspnam(
 
     goto cleanup;
 }
+#endif
diff --git a/lsass/interop/nsswitch/include/lsanss.h b/lsass/interop/nsswitch/include/lsanss.h
@@ -173,6 +173,7 @@ LsaNssWriteUserInfo(
     int          bufLen
     );
 
+#ifdef HAVE_SHADOW_H
 DWORD
 LsaNssWriteShadowInfo(
     DWORD        dwUserInfoLevel,
@@ -181,6 +182,7 @@ LsaNssWriteShadowInfo(
     char**       ppszBuf,
     int          bufLen
     );
+#endif
 
 VOID
 LsaNssClearEnumGroupsState(
@@ -257,6 +259,7 @@ LsaNssCommonPasswdGetpwuid(
     int * pErrorNumber
     );
 
+#ifdef HAVE_SHADOW_H
 NSS_STATUS
 LsaNssCommonShadowGetspent(
     PLSA_NSS_CACHED_HANDLE  pConnection,
@@ -276,6 +279,8 @@ LsaNssCommonShadowGetspnam(
     size_t bufLen,
     int * pErrorNumber
     );
+#endif
+
 
 NSS_STATUS
 LsaNssCommonGroupSetgrent(