diff options
Diffstat (limited to 'usr/src/lib/libsmbfs')
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/netshareenum.c | 5 | ||||
| -rw-r--r-- | usr/src/lib/libsmbfs/smb/ssnsetup.c | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/usr/src/lib/libsmbfs/smb/netshareenum.c b/usr/src/lib/libsmbfs/smb/netshareenum.c index bd2c24caec..af5a0bb9bd 100644 --- a/usr/src/lib/libsmbfs/smb/netshareenum.c +++ b/usr/src/lib/libsmbfs/smb/netshareenum.c @@ -37,8 +37,7 @@ /* END CSTYLED */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <stdlib.h> @@ -313,7 +312,7 @@ rap_netshareenum(struct smb_ctx *ctx, int *entriesp, int *totalp, error = smb_rap_NetShareEnum(ctx, 1, rpbuf, &bufsize, &entries, &total); if (error && - error != (SMB_ERROR_MORE_DATA | SMB_RAP_ERROR)) { + error != (ERROR_MORE_DATA | SMB_RAP_ERROR)) { free(rpbuf); return (error); } diff --git a/usr/src/lib/libsmbfs/smb/ssnsetup.c b/usr/src/lib/libsmbfs/smb/ssnsetup.c index c8234c8040..03f92dc62c 100644 --- a/usr/src/lib/libsmbfs/smb/ssnsetup.c +++ b/usr/src/lib/libsmbfs/smb/ssnsetup.c @@ -72,11 +72,6 @@ #include "ntlm.h" #include "smb_crypt.h" -/* - * When we have a _real_ ntstatus.h, eliminate this. - * XXX: Current smb.h defines it without the high bits. - */ -#define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 static int smb__ssnsetup(struct smb_ctx *ctx, @@ -284,7 +279,7 @@ smb_ssnsetup_spnego(struct smb_ctx *ctx, struct mbdata *hint_mb) goto out; if (ntstatus == 0) break; /* normal loop termination */ - if (ntstatus != STATUS_MORE_PROCESSING_REQUIRED) { + if (ntstatus != NT_STATUS_MORE_PROCESSING_REQUIRED) { err = EAUTH; goto out; } @@ -424,7 +419,7 @@ smb__ssnsetup(struct smb_ctx *ctx, * Note: err=0, means rq_status is valid. */ if (rqp->rq_status != 0 && - rqp->rq_status != STATUS_MORE_PROCESSING_REQUIRED) { + rqp->rq_status != NT_STATUS_MORE_PROCESSING_REQUIRED) { goto out; } |