------------------------------------------------------------ revno: 13320 revision-id: squid3@treenet.co.nz-20140322125852-ek8hzi2g2qsn9tf9 parent: squid3@treenet.co.nz-20140322120318-b6abh6i8tica2lin committer: Amos Jeffries branch nick: trunk timestamp: Sat 2014-03-22 06:58:52 -0600 message: Fix if-else mismatch in rev.13319 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140322125852-ek8hzi2g2qsn9tf9 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 90267310fa5ba0ad376a6efc17cb6681406ef419 # timestamp: 2014-03-22 13:58:27 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140322120318-\ # b6abh6i8tica2lin # # Begin patch === modified file 'helpers/basic_auth/NIS/basic_nis_auth.cc' --- helpers/basic_auth/NIS/basic_nis_auth.cc 2014-03-22 12:03:18 +0000 +++ helpers/basic_auth/NIS/basic_nis_auth.cc 2014-03-22 12:58:52 +0000 @@ -69,14 +69,14 @@ } else if (strcmp(nispasswd, (char *) crypt(passwd, nispasswd)) == 0) { /* All ok !, thanks... */ printf("OK\n"); + } else { + /* Password incorrect */ + printf("ERR Wrong password\n"); #else } else { /* Password incorrect */ printf("BH message=\"Missing crypto capability\"\n"); #endif - } else { - /* Password incorrect */ - printf("ERR Wrong password\n"); } } exit(0);