[DRBD-cvs] svn commit by lars - r2318 - trunk/user - fixed bad side effects of too much paranoia...

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2006-08-01 09:52:45 +0200 (Tue, 01 Aug 2006)
New Revision: 2318

Modified:
   trunk/user/drbdadm_adjust.c
   trunk/user/drbdadm_parser.c
Log:
fixed bad side effects of too much paranoia...


Modified: trunk/user/drbdadm_adjust.c
===================================================================
--- trunk/user/drbdadm_adjust.c	2006-07-31 14:29:02 UTC (rev 2317)
+++ trunk/user/drbdadm_adjust.c	2006-08-01 07:52:45 UTC (rev 2318)
@@ -187,6 +187,7 @@
 
 	yyin = m_popen(&pid,argv);
 	line = 1;
+	config_file = "drbdsetup/show";
 	running = parse_resource("drbdsetup/show");
 	fclose(yyin);
 	waitpid(pid,0,0);

Modified: trunk/user/drbdadm_parser.c
===================================================================
--- trunk/user/drbdadm_parser.c	2006-07-31 14:29:02 UTC (rev 2317)
+++ trunk/user/drbdadm_parser.c	2006-08-01 07:52:45 UTC (rev 2318)
@@ -368,7 +368,8 @@
 			EXP(TK_INTEGER);
 			host->port = yylval.txt;
 			range_check(R_PORT, "port", yylval.txt);
-			check_uniq("IP", "%s:%s", host->address, host->port);
+			if (!require_all) /* if not drbdsetup_dump */
+				check_uniq("IP", "%s:%s", host->address, host->port);
 			EXP(';');
 			break;
 		case TK_META_DISK:
@@ -505,8 +506,10 @@
 
 	if(local) {
 		res->me = host;
+		host->name = strdup("_this_host");
 	} else {
 		res->peer = host;
+		host->name = strdup("_remote_host");
 	}
 
 	parse_host_body(host,res,0);