From b6068fce1ab3af812c87ecb909ad2a5f9d044b06 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 2 Oct 2015 12:56:45 +0200
Subject: [PATCH] pdnssec: Throw an error on existing bind-dnssec-db

Closes #2403
---
 pdns/pdnssec.cc  | 2 +-
 pdns/ssqlite3.cc | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index e1585e001..8c078bb8d 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -1407,7 +1407,7 @@ try
   if(cmds[0] == "create-bind-db") {
 #ifdef HAVE_SQLITE3
     if(cmds.size() != 2) {
-      cerr << "Syntax: pdnssec create-bind-db fname"<<endl;
+      cerr << "Syntax: pdnssec create-bind-db FNAME"<<endl;
       return 0;
     }
     try {
diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc
index db8062aa2..536442b42 100644
--- a/pdns/ssqlite3.cc
+++ b/pdns/ssqlite3.cc
@@ -139,10 +139,13 @@ private:
 // Constructor.
 SSQLite3::SSQLite3( const std::string & database, bool creat )
 {
-  // Open the database connection.
-  if(!creat) 
-    if ( access( database.c_str(), F_OK ) == -1 )
+  if (access( database.c_str(), F_OK ) == -1){
+    if (!creat)
       throw sPerrorException( "SQLite database '"+database+"' does not exist yet" );
+  } else {
+    if (creat)
+      throw sPerrorException( "SQLite database '"+database+"' already exists" );
+  }
 
   if ( sqlite3_open( database.c_str(), &m_pDB)!=SQLITE_OK )
     throw sPerrorException( "Could not connect to the SQLite database '" + database + "'" );
-- 
2.40.0