diff options
| author | David Shaw <[email protected]> | 2006-07-17 04:11:30 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-07-17 04:11:30 +0000 |
| commit | b8b482b59628a1d1b35ae220073f5a6cd609ef74 (patch) | |
| tree | 6b52007d293198263b868894c13ae97d085f5e64 /keyserver/gpgkeys_ldap.c | |
| parent | * gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key, send_key_keyserver): (diff) | |
| download | gnupg-b8b482b59628a1d1b35ae220073f5a6cd609ef74.tar.gz gnupg-b8b482b59628a1d1b35ae220073f5a6cd609ef74.zip | |
* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,
send_key_keyserver): Improved version of previous fix. Force match on
spaces in string.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 6e5345e5d..357c874ea 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -608,7 +608,7 @@ send_key(int *eof) /* Assemble the INFO stuff into LDAP attributes */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"INFO %16s %5s\n",keyid,state)==2 + if(sscanf(line,"INFO%*[ ]%16s%*[ ]%5s\n",keyid,state)==2 && strcmp(state,"BEGIN")==0) { begin=1; @@ -654,7 +654,7 @@ send_key(int *eof) /* Now parse each line until we see the END */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"INFO %16s %3s\n",keyid,state)==2 + if(sscanf(line,"INFO%*[ ]%16s%*[ ]%3s\n",keyid,state)==2 && strcmp(state,"END")==0) { end=1; @@ -676,7 +676,7 @@ send_key(int *eof) /* Read and throw away stdin until we see the BEGIN */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"KEY %16s %5s\n",keyid,state)==2 + if(sscanf(line,"KEY%*[ ]%16s%*[ ]%5s\n",keyid,state)==2 && strcmp(state,"BEGIN")==0) { begin=1; @@ -695,7 +695,7 @@ send_key(int *eof) /* Now slurp up everything until we see the END */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"KEY %16s %3s\n",keyid,state)==2 + if(sscanf(line,"KEY%*[ ]%16s%*[ ]%3s\n",keyid,state)==2 && strcmp(state,"END")==0) { end=1; @@ -816,7 +816,7 @@ send_key_keyserver(int *eof) /* Read and throw away stdin until we see the BEGIN */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"KEY %16s %5s\n",keyid,state)==2 + if(sscanf(line,"KEY%*[ ]%16s%*[ ]%5s\n",keyid,state)==2 && strcmp(state,"BEGIN")==0) { begin=1; @@ -835,7 +835,7 @@ send_key_keyserver(int *eof) /* Now slurp up everything until we see the END */ while(fgets(line,MAX_LINE,input)!=NULL) - if(sscanf(line,"KEY %16s %3s\n",keyid,state)==2 + if(sscanf(line,"KEY%*[ ]%16s%*[ ]%3s\n",keyid,state)==2 && strcmp(state,"END")==0) { end=1; |