Postfix settings issues

Hello,

I am attempting to follow this tutorial:

https://www.digitalocean.com/community/articles/how-to-set-up-a-postfix-e-mail-server-with-dovecot

I’ve been able to follow a number of tutorials successfully, with a small extra bit of Googling and troubleshooting, but this one has evaded me pretty early on, at the part of the tutorial as detailed below:

---

First, configure the master.cf file (in /etc/postfix/). Add an extra “smtpd” instance called “submission” that will take mail from trusted clients for delivery to the world at large, which we don’t allow for anyone else. To do that, open master.cf (take a look at man 5 master if you want to understand what’s going on) and uncomment the submission config and add options to enable SASL:

submission inet n - - - - smtpd -o syslog_name=postfix/submission -o smtpd_tls_wrappermode=no -o smtpd_tls_security_level=encrypt -o smtpd_sasl_auth_enable=yes -o smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING -o smtpd_sasl_type=dovecot -o smtpd_sasl_path=private/auth

---

My master.cf file is pasted here: http://pastebin.com/Su5jWKEf

And when I check my Postfix version number in Ubuntu 12.04, I receive this message:

user@server:~$ sudo postconf mail_version mail_version = 2.9.6

My issues are that 1) I don’t understand if that tutorial is asking me to only uncomment the lines listed and 2) several of those lines, specifically:

-o smtpd_sasl_type=dovecot -o smtpd_sasl_path=private/auth -o smtpd_recipient_restrictions=permit_mynetworks,permit_sasl_authenticated,reject

don’t exist in my config file. I don’t know whether to add these lines or if the lack of these lines portends to some sort of problem.

Can anybody tell me how to proceed? I’ve managed to get as far as installing all kinds of things as a 100% newbie, thanks to help from the tutorials, Googling, and troubleshooting, but mail server set-up seems to be my kryptonite so far.

I tried posting to the tutorial itself, but my attempts to post always time-out. Thanks!

Cheers, Joseph