Index: src/common/read_config.c
===================================================================
RCS file: /cvsroot/slurm/slurm/src/common/read_config.c,v
retrieving revision 1.1.1.56.4.1
diff -u -r1.1.1.56.4.1 read_config.c
--- src/common/read_config.c	7 Dec 2011 14:24:09 -0000	1.1.1.56.4.1
+++ src/common/read_config.c	11 Jan 2012 22:46:03 -0000
@@ -2781,6 +2781,7 @@
 	    && (!strcmp(conf->proctrack_type,"proctrack/linuxproc")))
 		fatal("proctrack/linuxproc is incompatible with switch/elan");
 
+	conf->private_data = 0; /* Set to default before parsing PrivateData string */
 	if (s_p_get_string(&temp_str, "PrivateData", hashtbl)) {
 		if (strstr(temp_str, "account"))
 			conf->private_data |= PRIVATE_DATA_ACCOUNTS;
Index: src/common/slurm_protocol_defs.c
===================================================================
RCS file: /cvsroot/slurm/slurm/src/common/slurm_protocol_defs.c,v
retrieving revision 1.1.1.48
diff -u -r1.1.1.48 slurm_protocol_defs.c
--- src/common/slurm_protocol_defs.c	25 Oct 2011 18:16:15 -0000	1.1.1.48
+++ src/common/slurm_protocol_defs.c	11 Jan 2012 22:46:13 -0000
@@ -1522,7 +1522,7 @@
 {
 	if (str_len > 0)
 		str[0] = '\0';
-	if (str_len < 42) {
+	if (str_len < 55) {
 		error("private_data_string: output buffer too small");
 		return;
 	}
@@ -1554,7 +1554,12 @@
 			strcat(str, ",");
 		strcat(str, "accounts"); //9 len
 	}
-	// total len 42
+	if (private_data & PRIVATE_DATA_RESERVATIONS) {
+		if (str[0])
+			strcat(str, ",");
+		strcat(str, "reservations"); //13 len
+	}
+	// total len 55
 
 	if (str[0] == '\0')
 		strcat(str, "none");
Index: src/slurmctld/reservation.c
===================================================================
RCS file: /cvsroot/slurm/slurm/src/slurmctld/reservation.c,v
retrieving revision 1.1.1.33
diff -u -r1.1.1.33 reservation.c
--- src/slurmctld/reservation.c	25 Oct 2011 18:17:15 -0000	1.1.1.33
+++ src/slurmctld/reservation.c	11 Jan 2012 22:46:42 -0000
@@ -1807,7 +1807,7 @@
 		fatal("malloc: list_iterator_create");
 	while ((resv_ptr = (slurmctld_resv_t *) list_next(iter))) {
 		if ((slurmctld_conf.private_data & PRIVATE_DATA_RESERVATIONS)
-		    && !validate_slurm_user(uid)) {
+		    && !validate_operator(uid)) {
 			int i = 0;
 			for (i=0; i<resv_ptr->user_cnt; i++) {
 				if (resv_ptr->user_list[i] == uid)
Index: src/slurmdbd/read_config.c
===================================================================
RCS file: /cvsroot/slurm/slurm/src/slurmdbd/read_config.c,v
retrieving revision 1.1.1.26
diff -u -r1.1.1.26 read_config.c
--- src/slurmdbd/read_config.c	25 Oct 2011 18:16:11 -0000	1.1.1.26
+++ src/slurmdbd/read_config.c	11 Jan 2012 22:47:36 -0000
@@ -233,6 +233,8 @@
 		}
 		s_p_get_string(&slurmdbd_conf->pid_file, "PidFile", tbl);
 		s_p_get_string(&slurmdbd_conf->plugindir, "PluginDir", tbl);
+
+		slurmdbd_conf->private_data = 0; /* set default data visibility to all allowed */
 		if (s_p_get_string(&temp_str, "PrivateData", tbl)) {
 			if (strstr(temp_str, "account"))
 				slurmdbd_conf->private_data