Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gcc7 issues #457

Merged
merged 2 commits into from
Feb 6, 2017
Merged

Gcc7 issues #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ac123
Use bitwise not
ellert Feb 6, 2017
376999f
Proper fallthrough
ellert Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/XrdClient/XrdClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,15 +1372,15 @@ bool XrdClient::OpenFileWhenRedirected(char *newfhandle, bool &wasopen)
Info(XrdClientDebug::kHIDEBUG,
"OpenFileWhenRedirected", "Stripping off the 'delete' option." );

options &= !kXR_delete;
options &= ~kXR_delete;
options |= kXR_open_updt;
}

if (fOpenPars.options & kXR_new) {
Info(XrdClientDebug::kHIDEBUG,
"OpenFileWhenRedirected", "Stripping off the 'new' option." );

options &= !kXR_new;
options &= ~kXR_new;
options |= kXR_open_updt;
}

Expand Down
5 changes: 1 addition & 4 deletions src/XrdSecpwd/XrdSecProtocolpwd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ if (hs->Step == kXPS_init)
SessionSt.options = kOptsClntTty;
}
// case kXPS_puk:
if (hs->Step == kXPS_puk)
if ((hs->Step == kXPS_init) || (hs->Step == kXPS_puk))
{
// After auto-reg request, server puk have been saved in ParseClientInput:
// we need to start a full normal login now
Expand Down Expand Up @@ -1045,8 +1045,6 @@ if (hs->Step == kXPS_puk)
}
}
// case kXPS_signedrtag: // (after kXRC_verifysrv)
if (hs->Step == kXPS_signedrtag)
{
//
// Add the username
if (hs->User.length()) {
Expand Down Expand Up @@ -1081,7 +1079,6 @@ if (hs->Step == kXPS_signedrtag)
SessionSt.options |= kOptsChngPwd;
//
nextstep = kXPC_normal;
}
break;

case kXPS_credsreq:
Expand Down