Fixed assertion failure if user's home directory not accessible

diff --git a/.cvsignore b/.cvsignore
index fdc511797256abf7949ecb90a62404beb61d7408..8196f16f149ba959c7a2e974a4e850f629242816 100644 (file)
--- 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 62cb231b16600ce8b42ca59a393a932ee380f00f..2bf4967f921db09ca6c23f3486a1f251b0d91dec 100644 (file)
--- 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 0965f41868ff0252a56e1071cd5fd45ed509e808..e49b5ca6895b86e6a3782bf9cc9c5b78ff2e0226 100644 (file)
--- 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) {