Attachment #586128 for bug #691502

View | Details | Raw Unified | Return to bug 691502
Collapse All | Expand All




        _cleanup_free_ char *keyfile = NULL, *keydev = NULL;
        char *c;

        assert(keyspec);
        assert(keyfile);
        assert(keydev);

        if (!keyspec) {
                *keyfile = *keydev = NULL;
                return 0;
        }

        c = strrchr(keyspec, ':');
        if (c) {
                keyfile = strndup(keyspec, c-keyspec);

        }

        for (;;) {
                _cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL, *keyfile = NULL, *keydev = NULL;
                crypto_device *d = NULL;
                char *l, *uuid;
                int k;

Return to bug 691502

Lines 50-59 static int split_keyspec(const char keyspec, char keyfile, char *key Link Here

(-)a/src/cryptsetup/cryptsetup-generator.c (-2 / +6 lines)
50	_cleanup_free_ char keyfile = NULL, keydev = NULL;	50	_cleanup_free_ char keyfile = NULL, keydev = NULL;
51	char *c;	51	char *c;
52		52
53	assert(keyspec);
54	assert(keyfile);	53	assert(keyfile);
55	assert(keydev);	54	assert(keydev);
56		55
		56	if (!keyspec) {
		57	keyfile = keydev = NULL;
		58	return 0;
		59	}
		60
57	c = strrchr(keyspec, ':');	61	c = strrchr(keyspec, ':');
58	if (c) {	62	if (c) {
59	keyfile = strndup(keyspec, c-keyspec);	63	keyfile = strndup(keyspec, c-keyspec);
Lines 567-573 static int add_crypttab_devices(void) { Link Here
567	}	571	}
568		572
569	for (;;) {	573	for (;;) {
570	_cleanup_free_ char line = NULL, name = NULL, device = NULL, keydev = NULL, keyfile = NULL, keyspec = NULL, *options = NULL;	574	_cleanup_free_ char line = NULL, name = NULL, device = NULL, keyspec = NULL, options = NULL, keyfile = NULL, *keydev = NULL;
571	crypto_device *d = NULL;	575	crypto_device *d = NULL;
572	char l, uuid;	576	char l, uuid;
573	int k;	577	int k;