summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-08-02 12:41:49 +0200
committerMichael Adam <obnox@samba.org>2013-04-29 13:06:00 +0200
commit4a87a7ab61ae965cef6a8ffe2d017d1e877cce74 (patch)
tree1696b2d847c478f83ac89fce137cc733d7368538
parent86f88ee7b074fc8193a445e0c8ece58c3058b6c3 (diff)
downloadsamba-4a87a7ab61ae965cef6a8ffe2d017d1e877cce74.tar.gz
samba-4a87a7ab61ae965cef6a8ffe2d017d1e877cce74.tar.bz2
samba-4a87a7ab61ae965cef6a8ffe2d017d1e877cce74.zip
regedit: Don't panic if we can't open the file.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/utils/regedit.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/utils/regedit.c b/source3/utils/regedit.c
index 554c31e089..14215cb775 100644
--- a/source3/utils/regedit.c
+++ b/source3/utils/regedit.c
@@ -353,7 +353,11 @@ int main(int argc, char **argv)
/* some simple tests */
rv = reg_open_samba3(frame, &ctx);
- SMB_ASSERT(W_ERROR_IS_OK(rv));
+ if (!W_ERROR_IS_OK(rv)) {
+ TALLOC_FREE(frame);
+
+ return 1;
+ }
display_test_window(frame, ctx);