From: Wilfried Goesgens <dothebart@citadel.org>
Date: Wed, 8 Feb 2012 18:59:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.11~197
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c409452f51adb3b1a6645334d083487012dd5428;hp=d2936614cbe498d48aa8fb12542724845ce4cec2

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/server_main.c b/citadel/server_main.c
index b7019de5f..bab3ab69f 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -113,59 +113,55 @@ int main(int argc, char **argv)
 	InitializeMasterTSD();
 
 	/* parse command-line arguments */
-	for (a=1; a<argc; ++a) {
+	while ((a=getopt(argc, argv, "l:dh:x:t:Dr")) != EOF) switch(a) {
 
-		if (!strncmp(argv[a], "-l", 2)) {
-			safestrncpy(facility, &argv[a][2], sizeof(facility));
+		case 'l':
+			safestrncpy(facility, optarg, sizeof(facility));
 			syslog_facility = SyslogFacility(facility);
-		}
+			break;
 
 		/* run in the background if -d was specified */
-		else if (!strcmp(argv[a], "-d")) {
+		case 'd':
 			running_as_daemon = 1;
-		}
+			break;
 
-		else if (!strncmp(argv[a], "-h", 2)) {
-			relh=argv[a][2]!='/';
+		case 'h':
+			relh = optarg[0] != '/';
 			if (!relh) {
-				safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory);
+				safestrncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
 			}
 			else {
-				safestrncpy(relhome, &argv[a][2], sizeof relhome);
+				safestrncpy(relhome, optarg, sizeof relhome);
 			}
 			home=1;
-		}
+			break;
 
-		else if (!strncmp(argv[a], "-x", 2)) {
-			/* deprecated */
-		}
+		case 'x':	/* deprecated */
+			break;
 
-		else if (!strncmp(argv[a], "-t", 2)) {
-			/* deprecated */
-		}
+		case 't':	/* deprecated */
+			break;
 
-		else if (!strncmp(argv[a], "-D", 2)) {
+		case 'D':
 			dbg = 1;
-		}
+			break;
 
-		/* -r tells the server not to drop root permissions. don't use
-		 * this unless you know what you're doing. this should be
-		 * removed in the next release if it proves unnecessary. */
-		else if (!strcmp(argv[a], "-r")) {
+		/* -r tells the server not to drop root permissions.
+		 * Don't use this unless you know what you're doing.
+		 */
+		case 'r':
 			drop_root_perms = 0;
-		}
+			break;
 
+		default:
 		/* any other parameter makes it crash and burn */
-		else {
 			fprintf(stderr,	"citserver: usage: "
 					"citserver "
-					"[-lLogFacility] "
-					"[-d] [-D] [-s] "
-					"[-hHomeDir]\n"
+					"[-l LogFacility] "
+					"[-d] [-D] [-r] "
+					"[-h HomeDir]\n"
 			);
 			exit(1);
-		}
-
 	}
 
 	openlog("citserver",
diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index a2085028e..84af53594 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -261,8 +261,6 @@ void cit_backtrace(void)
 #endif
 }
 
-int direction;
-
 
 
 void title(const char *text)
@@ -1309,6 +1307,7 @@ int main(int argc, char *argv[])
 	/* Go through a series of dialogs prompting for config info */
 	for (curr = 1; curr < eMaxQuestions; ++curr) {
 		edit_value(curr);
+
 		if (	(curr == 6)
 			&& (atoi(configs[52]) != AUTHMODE_LDAP)
 			&& (atoi(configs[52]) != AUTHMODE_LDAP_AD)
diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html
index 00f0bee43..a2289a49f 100644
--- a/webcit/static/t/get_logged_in.html
+++ b/webcit/static/t/get_logged_in.html
@@ -23,7 +23,6 @@
     <a class="ib_button_link" href="javascript:authtoggle('authbox_openid');" title="OpenID"><span>
         OpenID
     </span></a>
-
 </li><??("X", 1)>
 <?!("COND:SERV:OPENID",2)><li class="ib_button" style='background-image: url("/static/webcit_icons/google-32x32.gif");'>
     <a class="ib_button_link" href="javascript:authtoggle('authbox_google');" title="Google"><span>
@@ -40,12 +39,15 @@
         AOL/AIM
     </span></a>
 </li><??("X", 4)>
-<li class="ib_button">
-</li>
-<li class="ib_button">
-</li>
-<li class="ib_button">
-</li>
+<??("COND:SERV:OPENID",5)>
+<li class="ib_button"></li>
+<li class="ib_button"></li>
+<li class="ib_button"></li>
+<li class="ib_button"></li>
+<??("X", 5)>
+<li class="ib_button"></li>
+<li class="ib_button"></li>
+<li class="ib_button"></li>
 </ul>
 </div>