commit 94fbf93add446439fb6f28d231d9b95d96b5d5f2 from: Stefan Sperling date: Sun Apr 22 13:48:01 2018 UTC unpriv process doesn't know the actual object id commit - 8c580685acce28b315d626e327e68287473b27b0 commit + 94fbf93add446439fb6f28d231d9b95d96b5d5f2 blob - a5baf8992edfe2ecb99afd5b264e96c34a1bff05 blob + a5c748f7f02eb28b36259ccf24769609c6b5986c --- lib/got_lib_privsep.h +++ lib/got_lib_privsep.h @@ -99,10 +99,9 @@ struct got_imsg_object { int flags; size_t hdrlen; size_t size; - struct got_object_id id; int ndeltas; /* this many GOT_IMSG_DELTA messages follow */ -} __attribute__((__packed__)); +}; /* Structure for GOT_IMSG_LOOSE_OBJECT_HEADER_REPLY data. */ struct got_imsg_loose_object_header_reply { blob - 36381556ce756969c55865370377ca56bb49582c blob + ffd6c618469a5401c783a73f57a2efa741ec7691 --- lib/privsep.c +++ lib/privsep.c @@ -103,7 +103,6 @@ got_privsep_send_obj(struct imsgbuf *ibuf, struct got_ iobj.flags = obj->flags; iobj.hdrlen = obj->hdrlen; iobj.size = obj->size; - memcpy(iobj.id.sha1, obj->id.sha1, SHA1_DIGEST_LENGTH); iobj.ndeltas = ndeltas; if (ndeltas > 0) { @@ -196,7 +195,6 @@ got_privsep_recv_obj(struct got_object **obj, struct i (*obj)->type = iobj.type; (*obj)->hdrlen = iobj.hdrlen; (*obj)->size = iobj.size; - memcpy((*obj)->id.sha1, iobj.id.sha1, SHA1_DIGEST_LENGTH); for (i = 0; i < iobj.ndeltas; i++) { /* TODO: Handle deltas */ }