diff --git a/servconf.c b/servconf.c
index 02fae0f..36b97a5 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.135 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.136 2004/08/11 11:09:54 dtucker Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -974,18 +974,18 @@
 parse_server_config(ServerOptions *options, const char *filename, Buffer *conf)
 {
 	int linenum, bad_options = 0;
-	char *cp, *cbuf;
+	char *cp, *obuf, *cbuf;
 
 	debug2("%s: config %s len %d", __func__, filename, buffer_len(conf));
 
-	cbuf = xstrdup(buffer_ptr(conf));
+	obuf = cbuf = xstrdup(buffer_ptr(conf));
 	linenum = 0;
 	while((cp = strsep(&cbuf, "\n")) != NULL) {
 		if (process_server_config_line(options, cp, filename,
 		    linenum++) != 0)
 			bad_options++;
 	}
-	free(cbuf);
+	xfree(obuf);
 	if (bad_options > 0)
 		fatal("%s: terminating, %d bad configuration options",
 		    filename, bad_options);