X-Git-Url: https://git.saurik.com/apple/configd.git/blobdiff_plain/dbf6a266c384fc8b55e00a396eebe5cb62e21547..d94708881e41bd90afd74b1a1dd0524d039ba3f7:/SystemConfiguration.fproj/SCDConsoleUser.c

diff --git a/SystemConfiguration.fproj/SCDConsoleUser.c b/SystemConfiguration.fproj/SCDConsoleUser.c
index 6fc7bc6..35a2cc5 100644
--- a/SystemConfiguration.fproj/SCDConsoleUser.c
+++ b/SystemConfiguration.fproj/SCDConsoleUser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005, 2009, 2011, 2015 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -39,21 +39,17 @@
 #include <SystemConfiguration/SCPrivate.h>
 
 
-#ifndef	kSCPropUsersConsoleUserName
+#undef	kSCPropUsersConsoleUserName
 #define	kSCPropUsersConsoleUserName	CFSTR("Name")
-#endif
 
-#ifndef	kSCPropUsersConsoleUserUID
+#undef	kSCPropUsersConsoleUserUID
 #define	kSCPropUsersConsoleUserUID	CFSTR("UID")
-#endif
 
-#ifndef	kSCPropUsersConsoleUserGID
+#undef	kSCPropUsersConsoleUserGID
 #define	kSCPropUsersConsoleUserGID	CFSTR("GID")
-#endif
 
-#ifndef	kSCPropUsersConsoleSessionInfo
+#undef	kSCPropUsersConsoleSessionInfo
 #define	kSCPropUsersConsoleSessionInfo	CFSTR("SessionInfo")
-#endif
 
 
 // from CoreGraphics (CGSession.h)
@@ -66,7 +62,7 @@ const CFStringRef kSCConsoleSessionLoginDone		= CFSTR("kCGSessionLoginDoneKey");
 // from CoreGraphics (CGSSession.h)
 const CFStringRef kSCConsoleSessionID			= CFSTR("kCGSSessionIDKey");			/* value is CFNumber */
 
-// from loginwindow
+// for loginwindow
 const CFStringRef kSCConsoleSessionSystemSafeBoot	= CFSTR("kCGSSessionSystemSafeBoot");		/* value is CFBoolean */
 const CFStringRef kSCConsoleSessionLoginwindowSafeLogin	= CFSTR("kCGSSessionLoginwindowSafeLogin");	/* value is CFBoolean */
 
@@ -90,18 +86,6 @@ SCDynamicStoreCopyConsoleUser(SCDynamicStoreRef	store,
 	CFStringRef		consoleUser	= NULL;
 	CFDictionaryRef		dict		= NULL;
 	CFStringRef		key;
-	Boolean			tempSession	= FALSE;
-
-	if (store == NULL) {
-		store = SCDynamicStoreCreate(NULL,
-					     CFSTR("SCDynamicStoreCopyConsoleUser"),
-					     NULL,
-					     NULL);
-		if (store == NULL) {
-			return NULL;
-		}
-		tempSession = TRUE;
-	}
 
 	key  = SCDynamicStoreKeyCreateConsoleUser(NULL);
 	dict = SCDynamicStoreCopyValue(store, key);
@@ -146,7 +130,6 @@ SCDynamicStoreCopyConsoleUser(SCDynamicStoreRef	store,
 
     done :
 
-	if (tempSession)	CFRelease(store);
 	if (dict)		CFRelease(dict);
 	return consoleUser;
 }
@@ -158,18 +141,6 @@ SCDynamicStoreCopyConsoleInformation(SCDynamicStoreRef store)
 	CFDictionaryRef		dict		= NULL;
 	CFArrayRef		info		= NULL;
 	CFStringRef		key;
-	Boolean			tempSession	= FALSE;
-
-	if (store == NULL) {
-		store = SCDynamicStoreCreate(NULL,
-					     CFSTR("SCDynamicStoreCopyConsoleUser"),
-					     NULL,
-					     NULL);
-		if (store == NULL) {
-			return NULL;
-		}
-		tempSession = TRUE;
-	}
 
 	key  = SCDynamicStoreKeyCreateConsoleUser(NULL);
 	dict = SCDynamicStoreCopyValue(store, key);
@@ -181,7 +152,7 @@ SCDynamicStoreCopyConsoleInformation(SCDynamicStoreRef store)
 
 	info = CFDictionaryGetValue(dict, kSCPropUsersConsoleSessionInfo);
 	info = isA_CFArray(info);
-	if (!info) {
+	if (info == NULL) {
 		_SCErrorSet(kSCStatusNoKey);
 		goto done;
 	}
@@ -190,7 +161,6 @@ SCDynamicStoreCopyConsoleInformation(SCDynamicStoreRef store)
 
     done :
 
-	if (tempSession)	CFRelease(store);
 	if (dict)		CFRelease(dict);
 	return info;
 }
@@ -206,22 +176,10 @@ SCDynamicStoreSetConsoleInformation(SCDynamicStoreRef	store,
 	CFStringRef		consoleUser;
 	CFMutableDictionaryRef	dict		= NULL;
 	CFStringRef		key		= SCDynamicStoreKeyCreateConsoleUser(NULL);
-	Boolean			ok		= TRUE;
-	Boolean			tempSession	= FALSE;
-
-	if (store == NULL) {
-		store = SCDynamicStoreCreate(NULL,
-					     CFSTR("SCDynamicStoreSetConsoleUser"),
-					     NULL,
-					     NULL);
-		if (store == NULL) {
-			return FALSE;
-		}
-		tempSession = TRUE;
-	}
+	Boolean			ok		= FALSE;
 
 	if ((user == NULL) && (sessions == NULL)) {
-		(void) SCDynamicStoreRemoveValue(store, key);
+		ok = SCDynamicStoreRemoveValue(store, key);
 		goto done;
 	}
 
@@ -256,7 +214,6 @@ SCDynamicStoreSetConsoleInformation(SCDynamicStoreRef	store,
 
 	if (dict)		CFRelease(dict);
 	if (key)		CFRelease(key);
-	if (tempSession)	CFRelease(store);
 	return ok;
 }
 
@@ -271,22 +228,10 @@ SCDynamicStoreSetConsoleUser(SCDynamicStoreRef	store,
 	CFMutableDictionaryRef	dict		= NULL;
 	CFStringRef		key		= SCDynamicStoreKeyCreateConsoleUser(NULL);
 	CFNumberRef		num;
-	Boolean			ok		= TRUE;
-	Boolean			tempSession	= FALSE;
-
-	if (store == NULL) {
-		store = SCDynamicStoreCreate(NULL,
-					     CFSTR("SCDynamicStoreSetConsoleUser"),
-					     NULL,
-					     NULL);
-		if (store == NULL) {
-			return FALSE;
-		}
-		tempSession = TRUE;
-	}
+	Boolean			ok		= FALSE;
 
 	if (user == NULL) {
-		(void) SCDynamicStoreRemoveValue(store, key);
+		ok = SCDynamicStoreRemoveValue(store, key);
 		goto done;
 	}
 
@@ -313,6 +258,5 @@ SCDynamicStoreSetConsoleUser(SCDynamicStoreRef	store,
 
 	if (dict)		CFRelease(dict);
 	if (key)		CFRelease(key);
-	if (tempSession)	CFRelease(store);
 	return ok;
 }