auth & [ak]log: Don't cast returns from malloc()

[openafs.git] / src / auth / ktc_nt.c

diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c
index e5032bb..8a91720 100644 (file)
--- a/src/auth/ktc_nt.c
+++ b/src/auth/ktc_nt.c
@@ -11,17 +11,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
 #include <roken.h>
 
-#include <afs/stds.h>
-#include <stdio.h>
-#include <afs/pthread_glock.h>
-#include <sys/types.h>
 #include <ctype.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <errno.h>
+
+#include <afs/pthread_glock.h>
 #include <rpc.h>
 #include <afs/smb_iocons.h>
 #include <afs/pioctl_nt.h>
@@ -68,7 +64,7 @@ char rpcErr[256];
 void __RPC_FAR *__RPC_USER
 midl_user_allocate(size_t cBytes)
 {
-    return ((void __RPC_FAR *)malloc(cBytes));
+    return malloc(cBytes);
 }
 
 void __RPC_USER
@@ -375,14 +371,13 @@ ktc_SetToken(struct ktc_principal *server, struct ktc_token *token,
     tp += sizeof(uuid);
     len += sizeof(uuid);
 
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
 
@@ -393,18 +388,17 @@ ktc_SetToken(struct ktc_principal *server, struct ktc_token *token,
            strcpy(rpcErr, "RPC failure in AFS gateway");
        else
            DceErrorInqText(status, rpcErr);
-       if (status == RPC_S_SERVER_UNAVAILABLE ||
+
+        ReleaseMutex(ktcMutex);
+        CloseHandle(ktcMutex);
+
+        if (status == RPC_S_SERVER_UNAVAILABLE ||
            status == EPT_S_NOT_REGISTERED) {
-           ReleaseMutex(ktcMutex);
-           CloseHandle(ktcMutex);
            return KTC_NOCMRPC;
        } else {
-           ReleaseMutex(ktcMutex);
-           CloseHandle(ktcMutex);
            return KTC_RPC;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
     /* set up for pioctl */
     iob.in = tbuffer;
@@ -414,10 +408,8 @@ ktc_SetToken(struct ktc_principal *server, struct ktc_token *token,
 
     code = pioctl(0, VIOCSETTOK, &iob, 0);
 
-#ifndef AFS_WIN95_ENV
     ReleaseMutex(ktcMutex);
     CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
 
     if (code) {
        if (code == -1) {
@@ -487,24 +479,21 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token,
     iob.out = tbuffer;
     iob.out_size = sizeof(tbuffer);
 
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
     code = pioctl(0, VIOCNEWGETTOK, &iob, 0);
     if (code) {
-#ifndef AFS_WIN95_ENV
        ReleaseMutex(ktcMutex);
        CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
+
        if (code == -1) {
            if (errno == ESRCH)
                return KTC_NOCELL;
@@ -519,8 +508,7 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token,
        } else
            return KTC_PIOCTLFAIL;
     }
-#ifndef AFS_WIN95_ENV
-    /* get rid of RPC for win95 build */
+
     /* RPC to receive session key */
     status = receive_key(uuid, token->sessionKey.data);
 
@@ -528,17 +516,17 @@ ktc_GetToken(struct ktc_principal *server, struct ktc_token *token,
     CloseHandle(ktcMutex);
 
     if (status != RPC_S_OK) {
-       if (status == 1)
-           strcpy(rpcErr, "RPC failure in AFS gateway");
-       else
-           DceErrorInqText(status, rpcErr);
-       if (status == RPC_S_SERVER_UNAVAILABLE
-           || status == EPT_S_NOT_REGISTERED)
-           return KTC_NOCMRPC;
-       else
-           return KTC_RPC;
+        if (status == 1)
+            strcpy(rpcErr, "RPC failure in AFS gateway");
+        else
+            DceErrorInqText(status, rpcErr);
+
+        if (status == RPC_S_SERVER_UNAVAILABLE ||
+            status == EPT_S_NOT_REGISTERED)
+            return KTC_NOCMRPC;
+        else
+            return KTC_RPC;
     }
-#endif /* AFS_WIN95_ENV */
 
     cp = tbuffer;
 
@@ -652,17 +640,15 @@ ktc_GetTokenEx(char *cellName, struct ktc_setTokenData **tokenSet) {
     iob.out = tbuffer;
     iob.out_size = sizeof(tbuffer);
 
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
 #if 0
     code = pioctl(0, VIOC_GETTOK2, &iob, 0);
@@ -671,10 +657,8 @@ ktc_GetTokenEx(char *cellName, struct ktc_setTokenData **tokenSet) {
        errno = EINVAL;
 #endif
 
-#ifndef AFS_WIN95_ENV
     ReleaseMutex(ktcMutex);
     CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
 
     /* If we can't use the new pioctl, the fall back to the old one. We then
      * need to convert the rxkad token we get back into the new format
@@ -746,17 +730,15 @@ ktc_ListTokens(int cellNum, int *cellNumP, struct ktc_principal *server)
     int code;
     HANDLE ktcMutex = NULL;
 
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
     tp = tbuffer;
 
@@ -772,10 +754,8 @@ ktc_ListTokens(int cellNum, int *cellNumP, struct ktc_principal *server)
 
     code = pioctl(0, VIOCGETTOK, &iob, 0);
 
-#ifndef AFS_WIN95_ENV
     ReleaseMutex(ktcMutex);
     CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
 
     if (code) {
        if (code == -1) {
@@ -859,17 +839,15 @@ ktc_ForgetToken(struct ktc_principal *server)
     if (strcmp(server->name, "afs")) {
        return ForgetOneLocalToken(server);
     }
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
     tp = tbuffer;
 
@@ -884,10 +862,9 @@ ktc_ForgetToken(struct ktc_principal *server)
     iob.out_size = sizeof(tbuffer);
 
     code = pioctl(0, VIOCDELTOK, &iob, 0);
-#ifndef AFS_WIN95_ENV
     ReleaseMutex(ktcMutex);
     CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
+
     if (code) {
        if (code == -1) {
            if (errno == ESRCH)
@@ -914,17 +891,15 @@ ktc_ForgetAllTokens()
 
     (void)ForgetLocalTokens();
 
-#ifndef AFS_WIN95_ENV
     ktcMutex = CreateMutex(NULL, TRUE, AFSGlobalKTCMutexName);
     if (ktcMutex == NULL)
-       return KTC_PIOCTLFAIL;
+       return KTC_TOKEN_MUTEX_FAIL;
     if (GetLastError() == ERROR_ALREADY_EXISTS) {
        if (WaitForSingleObject(ktcMutex, INFINITE) != WAIT_OBJECT_0) {
            CloseHandle(ktcMutex);
-           return KTC_PIOCTLFAIL;
+            return KTC_TOKEN_MUTEX_FAIL;
        }
     }
-#endif /* AFS_WIN95_ENV */
 
     /* do pioctl */
     iob.in = tbuffer;
@@ -933,10 +908,9 @@ ktc_ForgetAllTokens()
     iob.out_size = sizeof(tbuffer);
 
     code = pioctl(0, VIOCDELALLTOK, &iob, 0);
-#ifndef AFS_WIN95_ENV
     ReleaseMutex(ktcMutex);
     CloseHandle(ktcMutex);
-#endif /* AFS_WIN95_ENV */
+
     if (code) {
        if (code == -1) {
            if (errno == ENODEV)