Signed-off-by: Jeff Layton <[email protected]>
---
 cifscreds.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/cifscreds.c b/cifscreds.c
index c1edf71..0292bec 100644
--- a/cifscreds.c
+++ b/cifscreds.c
@@ -206,11 +206,9 @@ key_search_all_out:
 
 /* add or update a specific key to keyring */
 static key_serial_t
-key_add(const char *addr, const char *user,
-       const char *domain, const char *pass)
+key_add(const char *addr, const char *user, const char *pass)
 {
-       char desc[INET6_ADDRSTRLEN + MAX_USERNAME_SIZE + MAX_DOMAIN_SIZE + \
-               + sizeof(THIS_PROGRAM_NAME) + 3];
+       char desc[INET6_ADDRSTRLEN + MAX_USERNAME_SIZE + 
sizeof(THIS_PROGRAM_NAME) + 3];
 
        create_description(addr, user, desc);
 
@@ -292,8 +290,7 @@ static int cifscreds_add(int argc, char *argv[])
                *nextaddress++ = '\0';
 
        while (currentaddress) {
-               key_serial_t key = key_add(currentaddress, argv[3],
-                                          argc == 5 ? argv[4] : NULL, pass);
+               key_serial_t key = key_add(currentaddress, argv[3], pass);
                if (key <= 0) {
                        fprintf(stderr, "error: Add credential key for %s\n",
                                currentaddress);
@@ -510,8 +507,7 @@ static int cifscreds_update(int argc, char *argv[])
        pass = getpass("Password: ");
 
        for (id = 0; id < count; id++) {
-               key_serial_t key = key_add(addrs[id], argv[3],
-                                       argc == 5 ? argv[4] : NULL, pass);
+               key_serial_t key = key_add(addrs[id], argv[3], pass);
                if (key <= 0)
                        fprintf(stderr, "error: Update credential key "
                                "for %s\n", addrs[id]);
-- 
1.7.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to