sustaining/oi_151a/xnv: comparison open-src/xserver/xorg/sun-src/os/dtlogin.c

equal deleted inserted replaced

-:a8aa060182e1
+:1c99106ccbe0
-/* Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+/*
+* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * When shutting down, the Xserver restores it's original uid/gid as
 * needed by the cleanup/teardown actions in several drivers.
 *
 * For the original definition, see Sun ASARC case 1995/390
 */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
 #include <X11/Xos.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 /* Data stored in screen privates */
 struct dmScreenPriv {
 CloseScreenProcPtr	CloseScreen;
 };
-static int dmScreenKeyIndex;
+static DevPrivateKeyRec dmScreenKeyRec;
-static DevPrivateKey dmScreenKey = &dmScreenKeyIndex;
+#define dmScreenKey (&dmScreenKeyRec)
 static struct dmdata *dmHandlerData;
 static struct dmuser originalUser; /* user to switch back to in CloseDown */
 static Bool DtloginCloseScreen(int i, ScreenPtr pScreen);
 static void DtloginBlockHandler(pointer, struct timeval **, pointer);
 originalUser.homedir = getcwd(NULL, 0);
 originalUser.projid = getprojid();
 if (getuid() != 0)  return;
-dmd = Xcalloc(sizeof(struct dmdata));
+dmd = calloc(1, sizeof(struct dmdata));
 if (dmd == NULL) {
 	DtloginError("Failed to allocate %d bytes for display manager pipe",
 		     sizeof(struct dmdata));
 	return;
 }
 displayNumber = atoi(display); /* Assigned in dix/main.c */
 dmd->pipeFD = dtlogin_create_pipe(displayNumber, dmd);
 if (dmd->pipeFD == -1) {
-	xfree(dmd);
+	free(dmd);
 	return;
 }
 dmHandlerData = dmd;
 /* Unwrap CloseScreen and call down to further levels */
 pScreenPriv = (struct dmScreenPriv *)
 	dixLookupPrivate(&pScreen->devPrivates, dmScreenKey);
 pScreen->CloseScreen = pScreenPriv->CloseScreen;
-xfree ((pointer) pScreenPriv);
+free (pScreenPriv);
 return (*pScreen->CloseScreen) (i, pScreen);
 }
 static void
 RemoveBlockAndWakeupHandlers (DtloginBlockHandler,
 				  DtloginWakeupHandler, dmd);
 close(dmd->pipeFD);
 remove(dmd->pipename);
-xfree(dmd->pipename);
+free(dmd->pipename);
-xfree(dmd->buf);
+free(dmd->buf);
-xfree(dmd->user.homedir);
+free(dmd->user.homedir);
-xfree(dmd);
+free(dmd);
 if (dmHandlerData == dmd) {
 	dmHandlerData = NULL;
 }
 }
 char *p, *n;
 int done = 0;
 if (dmd->buf == NULL) {
 	dmd->bufsize = BUFLEN;
-	dmd->buf = xalloc(dmd->bufsize);
+	dmd->buf = malloc(dmd->bufsize);
 	dmd->buf[0] = '\0';
 }
 /* Read data from pipe and split into tokens, buffering the rest */
 while (!done) {
 	 * Realloc only if buf has filled up and we don't have a record
 	 * delimiter yet. Keep track of alloced size.
 	 */
 	if (bufLen > (dmd->bufsize/2)) {
 	    dmd->bufsize += BUFLEN;
-	    dmd->buf = xrealloc(dmd->buf, dmd->bufsize);
+	    dmd->buf = realloc(dmd->buf, dmd->bufsize);
 	}
 	nbRead = read(dmd->pipeFD, dmd->buf + bufLen,
 		      dmd->bufsize - bufLen - 1);
 	    dmd->user.homedir = xstrdup(v);
 	}
 	else if ( (strcmp(k, "UID") == 0) || (strcmp(k, "GID") == 0)
 		  || (strcmp(k, "G_LIST_ID") == 0) ) {
 	    /* Value is numeric, convert to int */
-	    int val;
+	    long val;
 	    errno = 0;
 	    val = strtol(v, NULL, 10);
 	    if ((val == 0) && (strcmp(v, "0") != 0)) {
 		DtloginInfo("Out of range number \"%s\"\n", v);
 		continue;
 	    }
 	    if (strcmp(k, "UID") == 0) {
-		dmd->user.uid = val;
+		dmd->user.uid = (uid_t) val;
 	    }
 	    else if (strcmp(k, "GID") == 0) {
-		dmd->user.gid = val;
+		dmd->user.gid = (gid_t) val;
 	    }
 	    else if (strcmp(k, "G_LIST_ID") == 0) {
 		if (dmd->user.groupid_cnt < NGROUPS_UMAX) {
-		    dmd->user.groupids[dmd->user.groupid_cnt++] = val;
+		    dmd->user.groupids[dmd->user.groupid_cnt++] = (gid_t) val;
 		}
 	    }
 	}
 	else {
 	    DtloginInfo("Unrecognized key \"%s\"\n", k);
 	/* Wrap closeScreen to allow resetting uid on closedown */
 	if ((user->uid != 0) && (user != &originalUser)) {
 	    int i;
-	    for (i = 0; i < screenInfo.numScreens; i++)
+	    if (dixRegisterPrivateKey(dmScreenKey, PRIVATE_SCREEN, 0)) {
-	    {
+		for (i = 0; i < screenInfo.numScreens; i++)
-		ScreenPtr pScreen = screenInfo.screens[i];
+		{
-		struct dmScreenPriv *pScreenPriv;
+		    ScreenPtr pScreen = screenInfo.screens[i];
+		    struct dmScreenPriv *pScreenPriv
-		pScreenPriv = (struct dmScreenPriv *)
+			= calloc(1, sizeof(struct dmScreenPriv));
-		    Xcalloc(sizeof(struct dmScreenPriv));
-		dixSetPrivate(&pScreen->devPrivates, dmScreenKey, pScreenPriv);
+		    dixSetPrivate(&pScreen->devPrivates, dmScreenKey,
+				  pScreenPriv);
-		if (pScreenPriv != NULL) {
-		    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+		    if (pScreenPriv != NULL) {
-		    pScreen->CloseScreen = DtloginCloseScreen;
+			pScreenPriv->CloseScreen = pScreen->CloseScreen;
+			pScreen->CloseScreen = DtloginCloseScreen;
+		    } else {
+			DtloginError("Failed to allocate %d bytes"
+				     " for uid reset info",
+				     sizeof(struct dmScreenPriv));
+		    }
 		}
+	    } else {
+		DtloginError("Failed to register screen private %s",
+			     "for uid reset info");
 	    }
 	}
 }
 if (user->homedir != NULL) {

changeset 1088	1c99106ccbe0
parent 943	294f64612d23