From: ian <ian>
Date: Sat, 30 Jan 1999 21:29:26 +0000 (+0000)
Subject: Fixed assertion failure if user's home directory not accessible
X-Git-Tag: debian_version_0_60_1~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=commitdiff_plain;h=21674c532793dcb831e2cf6108e7ff06e30e6b9d

Fixed assertion failure if user's home directory not accessible
---

diff --git a/.cvsignore b/.cvsignore
index fdc5117..8196f16 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,5 +23,6 @@ config.status
 *.new
 
 vd
+tilde
 slash-etc
 shipcheck
diff --git a/debian/changelog b/debian/changelog
index 62cb231..2bf4967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userv (0.60) unstable; urgency=low
+
+  * Fixed assertion failure if user's home directory not accessible.
+
+ --
+
 userv (0.59.2) unstable; urgency=low
 
   * Reran autoconf.
diff --git a/parser.c b/parser.c
index 0965f41..e49b5ca 100644
--- a/parser.c
+++ b/parser.c
@@ -839,8 +839,7 @@ int df_reset(int dtoken) {
 
   r= pa_mnl(); if (r) return r;
   r= parse_string(RESET_CONFIGURATION,"<builtin reset configuration>",1);
-  assert(!r);
-  return 0;  
+  return r;
 }
 
 int dfg_fdwant(int dtoken) {