Cleanup postinst to avoid recursive chown of database

[onak.git] / keyd.c

diff --git a/keyd.c b/keyd.c
index c1c2d5080d280d30b3e6f9f83db7a533e5f58d2a..ddd1366a9bb7c94b56b6d31fc7b181005ae2c663 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -13,14 +13,15 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <inttypes.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,7 +32,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "config.h"
+#include "build-config.h"
 
 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
@@ -47,7 +48,6 @@
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
-#include "version.h"
 
 /* Maximum number of clients we're prepared to accept at once */
 #define MAX_CLIENTS 16
@@ -444,8 +444,9 @@ static int sock_do(struct onak_dbctx *dbctx, int fd)
                                ret = 1;
                        }
                        if (ret == 0) {
-                               bytes = read(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
+                               bytes = read(fd, &fingerprint,
+                                               sizeof(fingerprint));
+                               if (bytes != sizeof(fingerprint)) {
                                        ret = 1;
                                }
                        }
@@ -455,32 +456,7 @@ static int sock_do(struct onak_dbctx *dbctx, int fd)
                                                ", result: %d",
                                                keyid,
                                                dbctx->delete_key(dbctx,
-                                                       keyid, false));
-                       }
-                       break;
-               case KEYD_CMD_GETFULLKEYID:
-                       if (!keyd_write_reply(fd, KEYD_REPLY_OK)) {
-                               ret = 1;
-                       }
-                       if (ret == 0) {
-                               bytes = read(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
-                                       ret = 1;
-                               }
-                       }
-                       if (ret == 0) {
-                               keyid = dbctx->getfullkeyid(dbctx, keyid);
-                               cmd = sizeof(keyid);
-                               bytes = write(fd, &cmd, sizeof(cmd));
-                               if (bytes != sizeof(cmd)) {
-                                       ret = 1;
-                               }
-                       }
-                       if (ret == 0) {
-                               bytes = write(fd, &keyid, sizeof(keyid));
-                               if (bytes != sizeof(keyid)) {
-                                       ret = 1;
-                               }
+                                                       &fingerprint, false));
                        }
                        break;
                case KEYD_CMD_KEYITER:
@@ -609,7 +585,7 @@ int main(int argc, char *argv[])
 {
        int fd = -1, maxfd, i, clients[MAX_CLIENTS];
        fd_set rfds = { 0 }; /* Avoid scan-build false report for FD_SET */
-       char sockname[1024];
+       char sockname[100];
        char *configfile = NULL;
        bool foreground = false;
        int optchar;
@@ -655,7 +631,8 @@ int main(int argc, char *argv[])
        }
        stats->started = time(NULL);
 
-       snprintf(sockname, 1023, "%s/%s", config.sock_dir, KEYD_SOCKET);
+       snprintf(sockname, sizeof(sockname) - 1, "%s/%s",
+                       config.sock_dir, KEYD_SOCKET);
        fd = sock_init(sockname);
 
        if (fd != -1) {