[systemd-devel] [PATCH] cryptsetup: copy value, not key for (rd.)luks.key

2014-04-19 Thread Matthew Monaco
---

Semi-shameless bump, but new email address would be preferred

 src/cryptsetup/cryptsetup-generator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptsetup/cryptsetup-generator.c 
b/src/cryptsetup/cryptsetup-generator.c
index 75d56dd..f4eeb2a 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -287,7 +287,7 @@ static int parse_proc_cmdline_item(const char *key, const 
char *value) {
 } else if (STR_IN_SET(key, luks.key, rd.luks.key)  value) {
 
 free(arg_keyfile);
-arg_keyfile = strdup(key);
+arg_keyfile = strdup(value);
 if (!arg_keyfile)
 return log_oom();
 
-- 
1.9.2

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] cryptsetup: copy value, not key for (rd.)luks.key

2014-04-19 Thread Zbigniew Jędrzejewski-Szmek
On Sat, Apr 19, 2014 at 12:56:45PM -0600, Matthew Monaco wrote:
 ---
Applied, thanks for the reminder.

 Semi-shameless bump, but new email address would be preferred

 Really? No one has used this?
Either that, or their password starts with luks.key= or rd.luks.key=.

Zbyszek

 
  src/cryptsetup/cryptsetup-generator.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cryptsetup/cryptsetup-generator.c 
 b/src/cryptsetup/cryptsetup-generator.c
 index 75d56dd..f4eeb2a 100644
 --- a/src/cryptsetup/cryptsetup-generator.c
 +++ b/src/cryptsetup/cryptsetup-generator.c
 @@ -287,7 +287,7 @@ static int parse_proc_cmdline_item(const char *key, const 
 char *value) {
  } else if (STR_IN_SET(key, luks.key, rd.luks.key)  value) {
  
  free(arg_keyfile);
 -arg_keyfile = strdup(key);
 +arg_keyfile = strdup(value);
  if (!arg_keyfile)
  return log_oom();
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH] cryptsetup: copy value, not key for (rd.)luks.key

2014-04-05 Thread Matthew Monaco
From: Matthew Monaco matthew.mon...@0x01b.net

---

Really? No one has used this?

 src/cryptsetup/cryptsetup-generator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptsetup/cryptsetup-generator.c 
b/src/cryptsetup/cryptsetup-generator.c
index 75d56dd..f4eeb2a 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -287,7 +287,7 @@ static int parse_proc_cmdline_item(const char *key, const 
char *value) {
 } else if (STR_IN_SET(key, luks.key, rd.luks.key)  value) {
 
 free(arg_keyfile);
-arg_keyfile = strdup(key);
+arg_keyfile = strdup(value);
 if (!arg_keyfile)
 return log_oom();
 
-- 
1.9.1

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel