diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:26 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (patch) | |
| tree | 5ac6a5d6276f2645e0d4f2ae89c92420bd66985f /source3/include | |
| parent | 81c46686db36eaffd25c013f19094b01a8406c6a (diff) | |
| download | samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.gz samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.bz2 samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.zip | |
Revert "s3: Move the global variable Protocol to struct smbd_server_connection"
This reverts commit c85a4c9ba4a7de65a7850f6f9708df66bd24deea.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/include/smb.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b708c26100..d4b734b8f9 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1073,8 +1073,8 @@ struct passwd *Get_Pwnam_alloc(TALLOC_CTX *mem_ctx, const char *user); /* The following definitions come from lib/util.c */ -enum protocol_types get_Protocol(const struct smbd_server_connection *c); -void set_Protocol(struct smbd_server_connection *c, enum protocol_types p); +enum protocol_types get_Protocol(void); +void set_Protocol(enum protocol_types p); bool all_zero(const uint8_t *ptr, size_t size); bool set_global_myname(const char *myname); const char *global_myname(void); diff --git a/source3/include/smb.h b/source3/include/smb.h index 94d2aa2570..a3acb7c415 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -652,7 +652,6 @@ struct smb_request { size_t unread_bytes; bool encrypted; connection_struct *conn; - struct smbd_server_connection *sconn; struct smb_perfcount_data pcd; /* |