Attachment #6548 for bug #12207

View | Details | Raw Unified | Return to bug 12207
Collapse All | Expand All




	int i, c;
	struct stat st;
	char *consoleuser = NULL;
	char *consoledev = NULL;
	enum {Set, Reset} sense = Set;

	while((c = getopt(argc, argv, "c:f:r")) != -1) {

	} else {
		sense = Reset;
	}
	/*
	   Devices tty0 (without devfs) and vc/0 (with devfs)
	   should be devices associated with the console
	   in the configuration.
	   Check both, as either may exist depending on
	   the presence or configuration of devfs.
	*/
	consoledev = check_console_name("vc/0", TRUE)?"vc/0":"tty0";
	if((sense == Set) && (consoleuser != NULL)) {
		set_permissions(consoledev, consoleuser, TRUE);
	}
	if(sense == Reset) {
		reset_permissions(consoledev, TRUE);
	}
	return 0;





	int i, c;
	struct stat st;
	char *consoleuser = NULL;
	char *consoledev = NULL;
	enum {Set, Reset} sense = Set;
	static int parsed = 0;


	} else {
		sense = Reset;
	}
	/*
           Devices tty0 (without devfs) and vc/0 (with devfs)
           should be devices associated with the console
           in the configuration.
           Check both, as either may exist depending on
           the presence or configuration of devfs.
        */
        consoledev = check_console_name("vc/0", TRUE)?"vc/0":"tty0";
	if((sense == Set) && (consoleuser != NULL)) {
		set_permissions_single(consoledev, consoleuser, TRUE, dname);
	}
	if(sense == Reset) {
		reset_permissions_single(consoledev, TRUE, dname);
	}
	return 0;


Return to bug 12207

Lines 56-61 Link Here

(-)Linux-PAM-0.75/modules/pam_console/pam_console_apply.c.orig (-2 / +11 lines)
56	int i, c;	56	int i, c;
57	struct stat st;	57	struct stat st;
58	char *consoleuser = NULL;	58	char *consoleuser = NULL;
		59	char *consoledev = NULL;
59	enum {Set, Reset} sense = Set;	60	enum {Set, Reset} sense = Set;
60		61
61	while((c = getopt(argc, argv, "c:f:r")) != -1) {	62	while((c = getopt(argc, argv, "c:f:r")) != -1) {
Lines 99-109 Link Here
99	} else {	100	} else {
100	sense = Reset;	101	sense = Reset;
101	}	102	}
		103	/*
		104	Devices tty0 (without devfs) and vc/0 (with devfs)
		105	should be devices associated with the console
		106	in the configuration.
		107	Check both, as either may exist depending on
		108	the presence or configuration of devfs.
		109	*/
		110	consoledev = check_console_name("vc/0", TRUE)?"vc/0":"tty0";
102	if((sense == Set) && (consoleuser != NULL)) {	111	if((sense == Set) && (consoleuser != NULL)) {
103	set_permissions("tty0", consoleuser, TRUE);	112	set_permissions(consoledev, consoleuser, TRUE);
104	}	113	}
105	if(sense == Reset) {	114	if(sense == Reset) {
106	reset_permissions("tty0", TRUE);	115	reset_permissions(consoledev, TRUE);
107	}	116	}
108	return 0;	117	return 0;
109		118

Lines 54-59 Link Here

(-)Linux-PAM-0.75/modules/pam_console/pam_console_apply_devfsd.c.orig (-2 / +11 lines)
54	int i, c;	54	int i, c;
55	struct stat st;	55	struct stat st;
56	char *consoleuser = NULL;	56	char *consoleuser = NULL;
		57	char *consoledev = NULL;
57	enum {Set, Reset} sense = Set;	58	enum {Set, Reset} sense = Set;
58	static int parsed = 0;	59	static int parsed = 0;
59		60
Lines 83-93 Link Here
83	} else {	84	} else {
84	sense = Reset;	85	sense = Reset;
85	}	86	}
		87	/*
		88	Devices tty0 (without devfs) and vc/0 (with devfs)
		89	should be devices associated with the console
		90	in the configuration.
		91	Check both, as either may exist depending on
		92	the presence or configuration of devfs.
		93	*/
		94	consoledev = check_console_name("vc/0", TRUE)?"vc/0":"tty0";
86	if((sense == Set) && (consoleuser != NULL)) {	95	if((sense == Set) && (consoleuser != NULL)) {
87	set_permissions_single("tty0", consoleuser, TRUE, dname);	96	set_permissions_single(consoledev, consoleuser, TRUE, dname);
88	}	97	}
89	if(sense == Reset) {	98	if(sense == Reset) {
90	reset_permissions_single("tty0", TRUE, dname);	99	reset_permissions_single(consoledev, TRUE, dname);
91	}	100	}
92	return 0;	101	return 0;
93		102