Move bindery authentication ncps to ncp_ncp.c file. ncp_login.c will stay

empty for a while.

1 files changed, 8 insertions, 5 deletions

diff --git a/sys/netncp/ncp_ncp.h b/sys/netncp/ncp_ncp.h
index 779350b73418..d715399b83d3 100644
--- a/sys/netncp/ncp_ncp.h
+++ b/sys/netncp/ncp_ncp.h
@@ -113,8 +113,6 @@ struct ucred;
 
 int  ncp_ncp_connect(struct ncp_conn *conn);
 int  ncp_ncp_disconnect(struct ncp_conn *conn);
-int  ncp_login(struct ncp_conn *conn, char *user, int objtype, char *password,
-	struct proc *p, struct ucred *cred);
 int  ncp_negotiate_buffersize(struct ncp_conn *conn, int size, int *target);
 int  ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize,
 	u_int8_t in_options);
@@ -122,9 +120,14 @@ int  ncp_get_bindery_object_id(struct ncp_conn *conn,
 		u_int16_t object_type, char *object_name, 
 		struct ncp_bindery_object *target,
 		struct proc *p,struct ucred *cred);
-int  ncp_login_object(struct ncp_conn *conn, unsigned char *username, 
-		int login_type, unsigned char *password,
-		struct proc *p,struct ucred *cred);
+int  ncp_get_encryption_key(struct ncp_conn *conn, char *target);
+int  ncp_login_encrypted(struct ncp_conn *conn,
+	struct ncp_bindery_object *object,
+	const u_char *key, const u_char *passwd,
+	struct proc *p, struct ucred *cred);
+int ncp_login_unencrypted(struct ncp_conn *conn, u_int16_t object_type, 
+	const char *object_name, const u_char *passwd,
+	struct proc *p, struct ucred *cred);
 int  ncp_read(struct ncp_conn *conn, ncp_fh *file, struct uio *uiop, struct ucred *cred);
 int  ncp_write(struct ncp_conn *conn, ncp_fh *file, struct uio *uiop, struct ucred *cred);