[DRBD-cvs] r1736 - trunk/drbd

[svn at svn.drbd.org]

Author: phil
Date: 2005-01-25 21:14:01 +0100 (Tue, 25 Jan 2005)
New Revision: 1736

Modified:
   trunk/drbd/drbd_fs.c
   trunk/drbd/drbd_receiver.c
Log:
Use the real key_len


Modified: trunk/drbd/drbd_fs.c
===================================================================
--- trunk/drbd/drbd_fs.c	2005-01-25 11:40:35 UTC (rev 1735)
+++ trunk/drbd/drbd_fs.c	2005-01-25 20:14:01 UTC (rev 1736)
@@ -575,6 +575,7 @@
 	// TODO plausibility check ...
 	memcpy(&mdev->conf,&new_conf,sizeof(struct net_config));
 
+	((char*)mdev->conf.shared_secret)[SHARED_SECRET_MAX-1]=0;
 #if 0
 FIXME
 	/* for the connection loss logic in drbd_recv

Modified: trunk/drbd/drbd_receiver.c
===================================================================
--- trunk/drbd/drbd_receiver.c	2005-01-25 11:40:35 UTC (rev 1735)
+++ trunk/drbd/drbd_receiver.c	2005-01-25 20:14:01 UTC (rev 1736)
@@ -1887,7 +1887,7 @@
 	char *right_response = NULL;
 	char *peers_ch = NULL;
 	Drbd_Header p;
-	unsigned int key_len = SHARED_SECRET_MAX;
+	unsigned int key_len = strlen(mdev->conf.shared_secret);
 	unsigned int resp_size;
 	int rv;