diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 19:44:50 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 19:44:50 +0100 |
| commit | 4f29e8a75c7ea63601724be2fd63eb776f839fde (patch) | |
| tree | 2ea03ea359a2fd51353f135e7ade99efbd4d5751 /source4/wrepl_server | |
| parent | 0d0aec18a2d2a49095da3fe1ac1dd51797c72d7d (diff) | |
| parent | a734c85c287ccf3280e7cefe69fae6b772b4ea8d (diff) | |
| download | samba-4f29e8a75c7ea63601724be2fd63eb776f839fde.tar.gz samba-4f29e8a75c7ea63601724be2fd63eb776f839fde.tar.bz2 samba-4f29e8a75c7ea63601724be2fd63eb776f839fde.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_in_connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index e6a69b829a..7c9c2b77bf 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -236,8 +236,8 @@ NTSTATUS wreplsrv_in_connection_merge(struct wreplsrv_partner *partner, NT_STATUS_NOT_OK_RETURN(status); /* - * make the wreplsrv_in_connection structure a child of the - * stream_connection, to match the hierachie of wreplsrv_accept + * make the wreplsrv_in_connection structure a child of the + * stream_connection, to match the hierarchy of wreplsrv_accept */ wrepl_in->conn = conn; talloc_steal(conn, wrepl_in); |